make.sh: Actually build Canary-Stability

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

diff --git a/make.sh b/make.sh
index 0c124ac81a6a2eff57f2f0bef22ce563099dbd73..e9c9202a8e2655164be875ee8c96e8894b20f1a3 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -26,7 +26,7 @@ NAME="IPFire"                                                 # Software name
 SNAME="ipfire"                                                 # Short name
 # If you update the version don't forget to update backupiso and add it to core update
 VERSION="2.25"                                                 # Version number
-CORE="156"                                                     # Core Level (Filename)
+CORE="157"                                                     # Core Level (Filename)
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
 MAX_RETRIES=1                                                  # prefetch/check loop
@@ -1196,20 +1196,12 @@ buildipfire() {
   case "${BUILD_ARCH}" in
        x86_64|aarch64)
                lfsmake2 linux                  KCFG=""
-#              lfsmake2 backports                      KCFG=""
-#              lfsmake2 e1000e                 KCFG=""
-#              lfsmake2 igb                            KCFG=""
-#              lfsmake2 ixgbe                  KCFG=""
                lfsmake2 xtables-addons         KCFG=""
                lfsmake2 linux-initrd                   KCFG=""
                ;;
        i586)
                # x86 kernel build
                lfsmake2 linux                  KCFG=""
-#              lfsmake2 backports                      KCFG=""
-#              lfsmake2 e1000e                 KCFG=""
-#              lfsmake2 igb                            KCFG=""
-#              lfsmake2 ixgbe                  KCFG=""
                lfsmake2 xtables-addons         KCFG=""
                lfsmake2 linux-initrd                   KCFG=""
                ;;
@@ -1217,10 +1209,6 @@ buildipfire() {
        armv5tel)
                # arm multi platform (Panda, Wandboard ...) kernel build
                lfsmake2 linux                  KCFG="-multi"
-#              lfsmake2 backports                      KCFG="-multi"
-#              lfsmake2 e1000e                 KCFG="-multi"
-#              lfsmake2 igb                            KCFG="-multi"
-#              lfsmake2 ixgbe                  KCFG="-multi"
                lfsmake2 xtables-addons         KCFG="-multi"
                lfsmake2 linux-initrd                   KCFG="-multi"
                ;;
@@ -1347,6 +1335,7 @@ buildipfire() {
   lfsmake2 Mail-Tools
   lfsmake2 MIME-Tools
   lfsmake2 Net-Server
+  lfsmake2 Canary-Stability
   lfsmake2 Convert-TNEF
   lfsmake2 Convert-UUlib
   lfsmake2 Archive-Tar
@@ -1510,8 +1499,6 @@ buildipfire() {
   lfsmake2 iw
   lfsmake2 wpa_supplicant
   lfsmake2 hostapd
-  lfsmake2 pycurl
-  lfsmake2 urlgrabber
   lfsmake2 syslinux
   lfsmake2 tftpd
   lfsmake2 cpufrequtils
@@ -1559,8 +1546,6 @@ buildipfire() {
   lfsmake2 crda
   lfsmake2 libsolv
   lfsmake2 python-distutils-extra
-  lfsmake2 python-lzma
-  lfsmake2 python-progressbar
   lfsmake2 ddns
   lfsmake2 python3-setuptools-scm
   lfsmake2 python3-six
@@ -1586,9 +1571,6 @@ buildipfire() {
   lfsmake2 fping
   lfsmake2 telnet
   lfsmake2 xinetd
-  lfsmake2 gpgme
-  lfsmake2 pygpgme
-  lfsmake2 pakfire3
   lfsmake2 stress
   lfsmake2 libstatgrab
   lfsmake2 sarg