Merge branch 'kernel-test' into seventeen

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

diff --git a/make.sh b/make.sh
index 8a2ecc6e1b5ab59d1e8a7f2b3f5504b8f0d79231..e6a648b563f4c866cc458a6e5b7118b83c45a744 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,9 +24,9 @@
 
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
-VERSION="2.15"                                                 # Version number
-CORE="82"                                                      # Core Level (Filename)
-PAKFIRE_CORE="82"                                              # Core Level (PAKFIRE)
+VERSION="2.17"                                                 # Version number
+CORE="86"                                                      # Core Level (Filename)
+PAKFIRE_CORE="85"                                              # 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
@@ -36,7 +36,7 @@ BUILD_IMAGES=1                                                        # Flash and Xen Downloader
 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=7
+TOOLCHAINVER=8
 
 # New architecture variables
 BUILD_ARCH="$(uname -m)"
@@ -418,6 +418,8 @@ buildipfire() {
 #              ipfiremake r8101                        KCFG="-pae"
                ipfiremake e1000e                       KCFG="-pae"
                ipfiremake igb                          KCFG="-pae"
+               ipfiremake ixgbe                        KCFG="-pae"
+
 
                # x86 kernel build
                ipfiremake linux                        KCFG=""
@@ -431,6 +433,7 @@ buildipfire() {
 #              ipfiremake r8101                        KCFG=""
                ipfiremake e1000e                       KCFG=""
                ipfiremake igb                          KCFG=""
+               ipfiremake ixgbe                        KCFG=""
                ;;
 
        armv5tel)
@@ -446,6 +449,7 @@ buildipfire() {
                ipfiremake cryptodev                    KCFG="-multi"
                ipfiremake e1000e                       KCFG="-multi"
                ipfiremake igb                          KCFG="-multi"
+               ipfiremake ixgbe                        KCFG="-multi"
 
                # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build
                ipfiremake linux                        KCFG="-kirkwood"
@@ -456,8 +460,9 @@ buildipfire() {
 #              ipfiremake r8169                        KCFG="-kirkwood"
 #              ipfiremake r8168                        KCFG="-kirkwood"
 #              ipfiremake r8101                        KCFG="-kirkwood"
-#              ipfiremake e1000e                       KCFG="-kirkwood"
+               ipfiremake e1000e                       KCFG="-kirkwood"
                ipfiremake igb                          KCFG="-kirkwood"
+               ipfiremake ixgbe                        KCFG="-kirkwood"
                ;;
   esac
   ipfiremake pkg-config