Merge branch 'thirteen' of git.ipfire.org:/pub/git/ipfire-2.x into thirteen

[ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index 011d75effa4932b4f2fd7f049160e9e509c10414..d8de79263a0656c86da3f0697805e3355bc92ee9 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -383,12 +383,12 @@ buildipfire() {
     ipfiremake mISDN                   KCFG="-xen"
     ipfiremake cryptodev               KCFG="-xen"
     ipfiremake compat-wireless         KCFG="-xen"
-#    ipfiremake r8169                  KCFG="-xen"
-#    ipfiremake r8168                  KCFG="-xen"
-#    ipfiremake r8101                  KCFG="-xen"
-#    ipfiremake e1000                  KCFG="-xen"
-#    ipfiremake e1000e                 KCFG="-xen"
-#    ipfiremake igb                    KCFG="-xen"
+    ipfiremake r8169                   KCFG="-xen"
+    ipfiremake r8168                   KCFG="-xen"
+    ipfiremake r8101                   KCFG="-xen"
+    ipfiremake e1000                   KCFG="-xen"
+    ipfiremake e1000e                  KCFG="-xen"
+    ipfiremake igb                     KCFG="-xen"
 
     ipfiremake linux                   KCFG="-pae"
 #    ipfiremake kvm-kmod                       KCFG="-pae"
@@ -397,12 +397,11 @@ buildipfire() {
     ipfiremake mISDN                   KCFG="-pae"
     ipfiremake cryptodev               KCFG="-pae"
     ipfiremake compat-wireless         KCFG="-pae"
-#    ipfiremake r8169                  KCFG="-pae"
-#    ipfiremake r8168                  KCFG="-pae"
-#    ipfiremake r8101                  KCFG="-pae"
-#    ipfiremake e1000                  KCFG="-pae"
-#    ipfiremake e1000e                 KCFG="-pae"
-#    ipfiremake igb                    KCFG="-pae"
+    ipfiremake r8169                   KCFG="-pae"
+    ipfiremake r8168                   KCFG="-pae"
+    ipfiremake r8101                   KCFG="-pae"
+    ipfiremake e1000e                  KCFG="-pae"
+    ipfiremake igb                     KCFG="-pae"
 
     ipfiremake linux                   KCFG=""
 #    ipfiremake kvm-kmod                       KCFG=""
@@ -411,19 +410,18 @@ buildipfire() {
     ipfiremake mISDN                   KCFG=""
     ipfiremake cryptodev               KCFG=""
     ipfiremake compat-wireless         KCFG=""
-#    ipfiremake r8169                  KCFG=""
-#    ipfiremake r8168                  KCFG=""
-#    ipfiremake r8101                  KCFG=""
-#    ipfiremake e1000                  KCFG=""
-#    ipfiremake e1000e                 KCFG=""
-#    ipfiremake igb                    KCFG=""
+    ipfiremake r8169                   KCFG=""
+    ipfiremake r8168                   KCFG=""
+    ipfiremake r8101                   KCFG=""
+    ipfiremake e1000e                  KCFG=""
+    ipfiremake igb                     KCFG=""
 
   else
     # arm-omap kernel build
     ipfiremake linux                   KCFG="-rpi"
     ipfiremake v4l-dvb                 KCFG="-rpi"
 #    ipfiremake kvm-kmod                       KCFG="-rpi"
-#    ipfiremake mISDN                  KCFG="-rpi"
+    ipfiremake mISDN                   KCFG="-rpi" NOPCI=1
     ipfiremake cryptodev               KCFG="-rpi"
     ipfiremake compat-wireless         KCFG="-rpi"
 #    ipfiremake r8169                  KCFG="-rpi"
@@ -436,7 +434,7 @@ buildipfire() {
     ipfiremake linux                   KCFG="-omap"
     ipfiremake v4l-dvb                 KCFG="-omap"
 #    ipfiremake kvm-kmod                       KCFG="-omap"
-#    ipfiremake mISDN                  KCFG="-omap"
+    ipfiremake mISDN                   KCFG="-omap" NOPCI=1
     ipfiremake cryptodev               KCFG="-omap"
     ipfiremake compat-wireless         KCFG="-omap"
 #    ipfiremake r8169                  KCFG="-omap"
@@ -450,7 +448,7 @@ buildipfire() {
     ipfiremake linux                   KCFG="-kirkwood"
     ipfiremake v4l-dvb                 KCFG="-kirkwood"
 #    ipfiremake kvm-kmod                       KCFG="-kirkwood"
-#    ipfiremake mISDN                  KCFG="-kirkwood"
+    ipfiremake mISDN                   KCFG="-kirkwood"
     ipfiremake cryptodev               KCFG="-kirkwood"
     ipfiremake compat-wireless         KCFG="-kirkwood"
 #    ipfiremake r8169                  KCFG="-kirkwood"
@@ -692,6 +690,7 @@ buildipfire() {
   ipfiremake iw
   ipfiremake wpa_supplicant
   ipfiremake hostapd
+  ipfiremake pycurl
   ipfiremake urlgrabber
   ipfiremake syslinux
   ipfiremake tftpd
@@ -760,6 +759,10 @@ buildipfire() {
   ipfiremake acpid
   ipfiremake fping
   ipfiremake telnet
+  ipfiremake libgpg-error
+  ipfiremake libassuan
+  ipfiremake gpgme
+  ipfiremake pygpgme
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -834,6 +837,8 @@ buildpackages() {
   if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]) && [ "${MACHINE_TYPE}" != "arm" ]; then
         cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/
         cp -f $BASEDIR/packages/meta-linux-xen $LFS/install/packages/
+        cp -f $BASEDIR/packages/linux-pae-*.ipfire $LFS/install/packages/
+        cp -f $BASEDIR/packages/meta-linux-pae $LFS/install/packages/
        ipfiremake xen-image
        rm -rf $LFS/install/packages/linux-xen-*.ipfire
        rm -rf $LFS/install/packages/meta-linux-xen