X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=make.sh;h=2130e372644cb6ce5a0b4e10bdf5356a20637d43;hb=45b7ed8519225a084a395c1ec7740646635ee9f8;hp=375f72d3aaed0e0178b20518c435d8af44b93bc2;hpb=7f69895cb57bc6a41cdcb5b3725dd8f2bd21643f;p=ipfire-2.x.git diff --git a/make.sh b/make.sh index 375f72d3aa..2130e37264 100755 --- a/make.sh +++ b/make.sh @@ -17,16 +17,16 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2007-2015 IPFire Team . # +# Copyright (C) 2007-2016 IPFire Team . # # # ############################################################################ # NAME="IPFire" # Software name SNAME="ipfire" # Short name -VERSION="2.17" # Version number -CORE="94" # Core Level (Filename) -PAKFIRE_CORE="93" # Core Level (PAKFIRE) +VERSION="2.19" # Version number +CORE="101" # Core Level (Filename) +PAKFIRE_CORE="100" # 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=10 +TOOLCHAINVER=11 # New architecture variables BUILD_ARCH="$(uname -m)" @@ -221,7 +221,7 @@ prepareenv() { # Run LFS static binary creation scripts one by one export CCACHE_DIR=$BASEDIR/ccache export CCACHE_COMPRESS=1 - export CCACHE_COMPILERCHECK="string:toolchain-${TOOLCHAINVER}:${TARGET_ARCH}" + export CCACHE_COMPILERCHECK="string:toolchain-${TOOLCHAINVER} ${TARGET_ARCH}" # Remove pre-install list of installed files in case user erase some files before rebuild rm -f $BASEDIR/build/usr/src/lsalr 2>/dev/null @@ -287,6 +287,7 @@ buildtoolchain() { lfsmake1 linux TOOLS=1 KCFG="-headers" lfsmake1 glibc lfsmake1 cleanup-toolchain PASS=1 + lfsmake1 gcc PASS=L lfsmake1 binutils PASS=2 lfsmake1 gcc PASS=2 lfsmake1 ccache PASS=2 @@ -330,6 +331,7 @@ buildbase() { lfsmake2 gmp lfsmake2 gmp-compat lfsmake2 mpfr + lfsmake2 libmpc lfsmake2 file lfsmake2 gcc lfsmake2 sed @@ -398,7 +400,9 @@ buildipfire() { ipfiremake unzip ipfiremake which ipfiremake linux-firmware + ipfiremake ath10k-firmware ipfiremake dvb-firmwares + ipfiremake mt7601u-firmware ipfiremake zd1211-firmware ipfiremake rpi-firmware ipfiremake bc @@ -422,9 +426,8 @@ buildipfire() { x86_64) ipfiremake linux KCFG="" ipfiremake backports KCFG="" - ipfiremake cryptodev KCFG="" ipfiremake e1000e KCFG="" -# ipfiremake igb KCFG="" + ipfiremake igb KCFG="" ipfiremake ixgbe KCFG="" ipfiremake xtables-addons KCFG="" ipfiremake linux-initrd KCFG="" @@ -433,9 +436,8 @@ buildipfire() { # x86-pae (Native and new XEN) kernel build ipfiremake linux KCFG="-pae" ipfiremake backports KCFG="-pae" - ipfiremake cryptodev KCFG="-pae" ipfiremake e1000e KCFG="-pae" -# ipfiremake igb KCFG="-pae" + ipfiremake igb KCFG="-pae" ipfiremake ixgbe KCFG="-pae" ipfiremake xtables-addons KCFG="-pae" ipfiremake linux-initrd KCFG="-pae" @@ -443,9 +445,8 @@ buildipfire() { # x86 kernel build ipfiremake linux KCFG="" ipfiremake backports KCFG="" - ipfiremake cryptodev KCFG="" ipfiremake e1000e KCFG="" -# ipfiremake igb KCFG="" + ipfiremake igb KCFG="" ipfiremake ixgbe KCFG="" ipfiremake xtables-addons KCFG="" ipfiremake linux-initrd KCFG="" @@ -455,16 +456,14 @@ buildipfire() { # arm-rpi (Raspberry Pi) kernel build ipfiremake linux KCFG="-rpi" ipfiremake backports KCFG="-rpi" - ipfiremake cryptodev KCFG="-rpi" ipfiremake xtables-addons KCFG="-rpi" ipfiremake linux-initrd KCFG="-rpi" # arm multi platform (Panda, Wandboard ...) kernel build ipfiremake linux KCFG="-multi" ipfiremake backports KCFG="-multi" - ipfiremake cryptodev KCFG="-multi" ipfiremake e1000e KCFG="-multi" -# ipfiremake igb KCFG="-multi" + ipfiremake igb KCFG="-multi" ipfiremake ixgbe KCFG="-multi" ipfiremake xtables-addons KCFG="-multi" ipfiremake linux-initrd KCFG="-multi" @@ -472,9 +471,8 @@ buildipfire() { # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build ipfiremake linux KCFG="-kirkwood" ipfiremake backports KCFG="-kirkwood" - ipfiremake cryptodev KCFG="-kirkwood" ipfiremake e1000e KCFG="-kirkwood" -# ipfiremake igb KCFG="-kirkwood" + ipfiremake igb KCFG="-kirkwood" ipfiremake ixgbe KCFG="-kirkwood" ipfiremake xtables-addons KCFG="-kirkwood" ipfiremake linux-initrd KCFG="-kirkwood" @@ -552,6 +550,7 @@ buildipfire() { ipfiremake GD-TextUtil ipfiremake perl-Device-SerialPort ipfiremake perl-Device-Modem + ipfiremake perl-Apache-Htpasswd ipfiremake gnupg ipfiremake hdparm ipfiremake sdparm @@ -681,11 +680,11 @@ buildipfire() { ipfiremake libevent2 ipfiremake portmap ipfiremake nfs + ipfiremake gnu-netcat ipfiremake nmap ipfiremake ncftp ipfiremake etherwake ipfiremake bwm-ng - ipfiremake tripwire ipfiremake sysstat ipfiremake vsftpd ipfiremake strongswan @@ -699,6 +698,11 @@ buildipfire() { ipfiremake elinks ipfiremake igmpproxy ipfiremake fbset + ipfiremake opus + ipfiremake python-six + ipfiremake python-pyparsing + ipfiremake spice-protocol + ipfiremake spice ipfiremake sdl ipfiremake qemu ipfiremake sane @@ -747,13 +751,13 @@ buildipfire() { ipfiremake gutenprint ipfiremake apcupsd ipfiremake iperf - ipfiremake netcat + ipfiremake iperf3 ipfiremake 7zip ipfiremake lynis ipfiremake streamripper ipfiremake sshfs ipfiremake taglib - ipfiremake mediatomb + #ipfiremake mediatomb ipfiremake sslh ipfiremake perl-gettext ipfiremake perl-Sort-Naturally @@ -850,6 +854,12 @@ buildipfire() { ipfiremake perl-Text-CSV_XS ipfiremake swconfig ipfiremake haproxy + ipfiremake ipset + ipfiremake lua + ipfiremake dnsdist + ipfiremake bird + ipfiremake dmidecode + ipfiremake mcelog } buildinstaller() { @@ -906,6 +916,10 @@ buildpackages() { mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1 cd $BASEDIR + + # remove not useable iso on armv5tel (needed to build flash images) + [ "${TARGET_ARCH}" = "armv5tel" ] && rm -rf *.iso + for i in `ls *.bz2 *.img.gz *.iso`; do md5sum $i > $i.md5 done