X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=e6a648b563f4c866cc458a6e5b7118b83c45a744;hp=7b75b87c21176fe3fa7c06a9ca36055c38b848ad;hb=b76a0377bece73e0ac34ac310b2a8b2fcb8813c7;hpb=38a159627381ce0a867b80c386ef1a0dc3fe2860 diff --git a/make.sh b/make.sh index 7b75b87c21..e6a648b563 100755 --- 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)" @@ -401,6 +401,7 @@ buildipfire() { ipfiremake dracut ipfiremake lvm2 ipfiremake multipath-tools + ipfiremake freetype ipfiremake grub case "${TARGET_ARCH}" in @@ -417,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="" @@ -430,6 +433,7 @@ buildipfire() { # ipfiremake r8101 KCFG="" ipfiremake e1000e KCFG="" ipfiremake igb KCFG="" + ipfiremake ixgbe KCFG="" ;; armv5tel) @@ -445,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" @@ -455,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 @@ -488,7 +494,6 @@ buildipfire() { ipfiremake libpng ipfiremake libtiff ipfiremake libart - ipfiremake freetype ipfiremake gd ipfiremake popt ipfiremake pcre