X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=9e34f9857200b8b83fa05ada233bd7916cb0c441;hp=1925929058d420636becaee59d0128c96b1c693d;hb=57bf7620699743fe14591c2f4050c947d276fd40;hpb=7383bf2b1bdd343dcbe1f9f49f76cbc157316ee1 diff --git a/make.sh b/make.sh index 1925929058..9e34f98572 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="101" # 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=9 +TOOLCHAINVER=11 # New architecture variables BUILD_ARCH="$(uname -m)" @@ -86,21 +86,6 @@ if [ -z $EDITOR ]; then [ -z $EDITOR ] && exiterror "You should have installed an editor." fi -# Prepare string for /etc/system-release. -SYSTEM_RELEASE="${NAME} ${VERSION} (${MACHINE})" -if [ "$(git status -s | wc -l)" == "0" ]; then - GIT_STATUS="" -else - GIT_STATUS="-dirty" -fi -case "$GIT_BRANCH" in - core*|beta?|rc?) - SYSTEM_RELEASE="${SYSTEM_RELEASE} - $GIT_BRANCH$GIT_STATUS" - ;; - *) - SYSTEM_RELEASE="${SYSTEM_RELEASE} - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT$GIT_STATUS" - ;; -esac prepareenv() { ############################################################################ @@ -236,15 +221,36 @@ prepareenv() { # Run LFS static binary creation scripts one by one export CCACHE_DIR=$BASEDIR/ccache export CCACHE_COMPRESS=1 - export CCACHE_COMPILERCHECK="none" + 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 + + # Prepare string for /etc/system-release. + SYSTEM_RELEASE="${NAME} ${VERSION} (${MACHINE})" + if [ "$(git status -s | wc -l)" == "0" ]; then + GIT_STATUS="" + else + GIT_STATUS="-dirty" + fi + case "$GIT_BRANCH" in + core*|beta?|rc?) + SYSTEM_RELEASE="${SYSTEM_RELEASE} - $GIT_BRANCH$GIT_STATUS" + ;; + *) + SYSTEM_RELEASE="${SYSTEM_RELEASE} - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT$GIT_STATUS" + ;; + esac } buildtoolchain() { local error=false case "${TARGET_ARCH}:${BUILD_ARCH}" in + # x86_64 + x86_64:x86_64) + # This is working. + ;; + # x86 i586:i586|i586:i686|i586:x86_64) # These are working. @@ -281,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 @@ -324,6 +331,7 @@ buildbase() { lfsmake2 gmp lfsmake2 gmp-compat lfsmake2 mpfr + lfsmake2 libmpc lfsmake2 file lfsmake2 gcc lfsmake2 sed @@ -332,6 +340,7 @@ buildbase() { lfsmake2 iana-etc lfsmake2 m4 lfsmake2 bison + lfsmake2 ncurses-compat lfsmake2 ncurses lfsmake2 procps lfsmake2 libtool @@ -392,7 +401,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 @@ -413,13 +424,21 @@ buildipfire() { ipfiremake iptables case "${TARGET_ARCH}" in + x86_64) + ipfiremake linux KCFG="" + ipfiremake backports KCFG="" + ipfiremake e1000e KCFG="" + ipfiremake igb KCFG="" + ipfiremake ixgbe KCFG="" + ipfiremake xtables-addons KCFG="" + ipfiremake linux-initrd KCFG="" + ;; i586) # 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" @@ -427,9 +446,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="" @@ -439,16 +457,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" @@ -456,9 +472,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" @@ -536,6 +551,7 @@ buildipfire() { ipfiremake GD-TextUtil ipfiremake perl-Device-SerialPort ipfiremake perl-Device-Modem + ipfiremake perl-Apache-Htpasswd ipfiremake gnupg ipfiremake hdparm ipfiremake sdparm @@ -633,6 +649,7 @@ buildipfire() { ipfiremake screen ipfiremake smartmontools ipfiremake htop + ipfiremake chkconfig ipfiremake postfix ipfiremake fetchmail ipfiremake cyrus-imapd @@ -640,6 +657,7 @@ buildipfire() { ipfiremake clamav ipfiremake spamassassin ipfiremake amavisd + ipfiremake dma ipfiremake alsa ipfiremake mpfire ipfiremake guardian @@ -663,11 +681,12 @@ buildipfire() { ipfiremake libevent2 ipfiremake portmap ipfiremake nfs + ipfiremake gnu-netcat + ipfiremake ncat ipfiremake nmap ipfiremake ncftp ipfiremake etherwake ipfiremake bwm-ng - ipfiremake tripwire ipfiremake sysstat ipfiremake vsftpd ipfiremake strongswan @@ -681,6 +700,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 @@ -712,6 +736,8 @@ buildipfire() { ipfiremake perl-Net-SMTP-SSL ipfiremake perl-MIME-Base64 ipfiremake perl-Authen-SASL + ipfiremake perl-MIME-Lite + ipfiremake perl-Email-Date-Format ipfiremake git ipfiremake squidclamav ipfiremake vnstat @@ -727,13 +753,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 @@ -830,6 +856,13 @@ buildipfire() { ipfiremake perl-Text-CSV_XS ipfiremake swconfig ipfiremake haproxy + ipfiremake ipset + ipfiremake lua + ipfiremake dnsdist + ipfiremake bird + ipfiremake dmidecode + ipfiremake mcelog + ipfiremake rtpproxy } buildinstaller() { @@ -886,6 +919,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