Merge branch 'aarch64' into next

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

diff --git a/make.sh b/make.sh
index aaaeb751e20d1e699d53154e046e82757bfe5e44..cfb06fcd0e44ec5703f40d4910c2acf71bd58ef3 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,9 +24,9 @@
 
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
-VERSION="2.19"                                                 # Version number
-CORE="121"                                                     # Core Level (Filename)
-PAKFIRE_CORE="120"                                             # Core Level (PAKFIRE)
+VERSION="2.21"                                                 # Version number
+CORE="123"                                                     # Core Level (Filename)
+PAKFIRE_CORE="122"                                             # Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`                   # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
@@ -37,7 +37,7 @@ KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
 GIT_TAG=$(git tag | tail -1)                                   # Git Tag
 GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit
 
-TOOLCHAINVER=20180213
+TOOLCHAINVER=20180606
 
 ###############################################################################
 #
@@ -1137,6 +1137,17 @@ buildipfire() {
 #              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"
+               ;;
+
+       aarch64)
+               # arm multi platform (RPi3, OrangePi PC2 ...) 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"
@@ -1323,7 +1334,6 @@ buildipfire() {
   lfsmake2 mc
   lfsmake2 wget
   lfsmake2 bridge-utils
-#  lfsmake2 screen
   lfsmake2 smartmontools
   lfsmake2 htop
   lfsmake2 chkconfig
@@ -1535,6 +1545,7 @@ buildipfire() {
   lfsmake2 iftop
   lfsmake2 mdns-repeater
   lfsmake2 i2c-tools
+  lfsmake2 nss-myhostname
 }
 
 buildinstaller() {