Merge branch 'kernel-test' into seventeen

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

diff --git a/make.sh b/make.sh
index e16e51b95f1bd6f2aa93e92e6b6f8d53f1ea72fe..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="81"                                              # 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)"
@@ -376,7 +376,6 @@ buildbase() {
     lfsmake2 vim
     lfsmake2 xz
     lfsmake2 paxctl
-    lfsmake2 grub
 }
 
 buildipfire() {
@@ -400,6 +399,10 @@ buildipfire() {
   ipfiremake cpio
   ipfiremake mdadm
   ipfiremake dracut
+  ipfiremake lvm2
+  ipfiremake multipath-tools
+  ipfiremake freetype
+  ipfiremake grub
 
   case "${TARGET_ARCH}" in
        i586)
@@ -415,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=""
@@ -428,6 +433,7 @@ buildipfire() {
 #              ipfiremake r8101                        KCFG=""
                ipfiremake e1000e                       KCFG=""
                ipfiremake igb                          KCFG=""
+               ipfiremake ixgbe                        KCFG=""
                ;;
 
        armv5tel)
@@ -443,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"
@@ -453,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
@@ -486,7 +494,6 @@ buildipfire() {
   ipfiremake libpng
   ipfiremake libtiff
   ipfiremake libart
-  ipfiremake freetype
   ipfiremake gd
   ipfiremake popt
   ipfiremake pcre
@@ -860,6 +867,7 @@ buildpackages() {
   modprobe loop 2>/dev/null
   if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ] || [ -e "/dev/loop-control" ]); then
        ipfiremake flash-images
+       ipfiremake flash-images SCON=1
   fi
 
   mv $LFS/install/images/{*.iso,*.tgz,*.img.gz,*.bz2} $BASEDIR >> $LOGFILE 2>&1