Merge remote-tracking branch 'origin/thirteen' into thirteen

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

diff --git a/make.sh b/make.sh
index e02365f45bbbdc1767f6c831b9779eecf4028da3..768fde76a982ae6eb5169b3076200c63653e9cf8 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.13"                                                 # Version number
-CORE="62"                                                      # Core Level (Filename)
-PAKFIRE_CORE="62"                                              # Core Level (PAKFIRE)
+CORE="63"                                                      # Core Level (Filename)
+PAKFIRE_CORE="63"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`             # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
@@ -374,14 +374,13 @@ buildipfire() {
   ipfiremake linux-firmware
   ipfiremake zd1211-firmware
   ipfiremake rpi-firmware
-  ipfiremake fw_ath9k_htc
   ipfiremake u-boot
 
   # The xen and PAE kernels are only available for x86
   if [ "${MACHINE_TYPE}" != "arm" ]; then
     ipfiremake linux2                  KCFG="-xen"
     ipfiremake v4l-dvb                 KCFG="-xen"
-#    ipfiremake mISDN                  KCFG="-xen"
+    ipfiremake mISDN                   KCFG="-xen"
     ipfiremake cryptodev               KCFG="-xen"
     ipfiremake compat-wireless         KCFG="-xen"
 #    ipfiremake r8169                  KCFG="-xen"
@@ -395,7 +394,7 @@ buildipfire() {
 #    ipfiremake kvm-kmod                       KCFG="-pae"
     ipfiremake v4l-dvb                 KCFG="-pae"
     ipfiremake alsa                    KCFG="-pae" KMOD=1
-#    ipfiremake mISDN                  KCFG="-pae"
+    ipfiremake mISDN                   KCFG="-pae"
     ipfiremake cryptodev               KCFG="-pae"
     ipfiremake compat-wireless         KCFG="-pae"
 #    ipfiremake r8169                  KCFG="-pae"
@@ -409,7 +408,7 @@ buildipfire() {
 #    ipfiremake kvm-kmod                       KCFG=""
     ipfiremake v4l-dvb                 KCFG=""
     ipfiremake alsa                    KCFG="" KMOD=1
-#    ipfiremake mISDN                  KCFG=""
+    ipfiremake mISDN                   KCFG=""
     ipfiremake cryptodev               KCFG=""
     ipfiremake compat-wireless         KCFG=""
 #    ipfiremake r8169                  KCFG=""
@@ -435,7 +434,7 @@ buildipfire() {
 #    ipfiremake igb                    KCFG="-rpi"
 
     ipfiremake linux                   KCFG="-omap"
-#    ipfiremake v4l-dvb                        KCFG="-omap"
+    ipfiremake v4l-dvb                 KCFG="-omap"
 #    ipfiremake kvm-kmod                       KCFG="-omap"
 #    ipfiremake mISDN                  KCFG="-omap"
     ipfiremake cryptodev               KCFG="-omap"
@@ -693,6 +692,7 @@ buildipfire() {
   ipfiremake iw
   ipfiremake wpa_supplicant
   ipfiremake hostapd
+  ipfiremake pycurl
   ipfiremake urlgrabber
   ipfiremake syslinux
   ipfiremake tftpd
@@ -761,6 +761,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
@@ -835,6 +839,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