X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=make.sh;h=3d4360379b2ff3db69b0c9696926ac0af80731c6;hb=c07053012f7007a627a92141db162675370c909e;hp=0326a90648b4e4361398c56f87502a484573851b;hpb=758d959652ee8fbc018b04d75624ec61ed64e227;p=ipfire-2.x.git diff --git a/make.sh b/make.sh index 0326a90648..2f50eff7aa 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-2014 IPFire Team . # +# Copyright (C) 2007-2016 IPFire Team . # # # ############################################################################ # NAME="IPFire" # Software name SNAME="ipfire" # Short name -VERSION="2.17" # Version number -CORE="89" # Core Level (Filename) -PAKFIRE_CORE="89" # Core Level (PAKFIRE) +VERSION="2.19" # Version number +CORE="100" # 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=8 +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 @@ -383,15 +391,18 @@ buildipfire() { export LOGFILE ipfiremake configroot ipfiremake backup + ipfiremake pkg-config ipfiremake libusb - ipfiremake libusbx + ipfiremake libusb-compat ipfiremake libpcap ipfiremake ppp ipfiremake pptp ipfiremake unzip ipfiremake which ipfiremake linux-firmware + ipfiremake ath10k-firmware ipfiremake dvb-firmwares + ipfiremake mt7601u-firmware ipfiremake zd1211-firmware ipfiremake rpi-firmware ipfiremake bc @@ -403,25 +414,41 @@ buildipfire() { ipfiremake multipath-tools ipfiremake freetype ipfiremake grub + ipfiremake libmnl + ipfiremake libnfnetlink + ipfiremake libnetfilter_queue + ipfiremake libnetfilter_conntrack + ipfiremake libnetfilter_cthelper + ipfiremake libnetfilter_cttimeout + 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" # 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="" ;; @@ -429,31 +456,31 @@ 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" # 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" ;; esac - ipfiremake pkg-config + ipfiremake xtables-addons USPACE="1" ipfiremake openssl - ipfiremake openssl-compat + [ "${TARGET_ARCH}" = "i586" ] && ipfiremake openssl KCFG='-sse2' ipfiremake libgpg-error ipfiremake libgcrypt ipfiremake libassuan @@ -468,7 +495,9 @@ buildipfire() { ipfiremake curl ipfiremake tcl ipfiremake sqlite + ipfiremake libffi ipfiremake python + ipfiremake ca-certificates ipfiremake fireinfo ipfiremake libnet ipfiremake libnl @@ -499,7 +528,8 @@ buildipfire() { ipfiremake openldap ipfiremake apache2 ipfiremake php - ipfiremake apache2 PASS=C + ipfiremake web-user-interface + ipfiremake flag-icons ipfiremake jquery ipfiremake arping ipfiremake beep @@ -520,14 +550,13 @@ buildipfire() { ipfiremake GD-TextUtil ipfiremake perl-Device-SerialPort ipfiremake perl-Device-Modem + ipfiremake perl-Apache-Htpasswd ipfiremake gnupg ipfiremake hdparm ipfiremake sdparm ipfiremake mtools ipfiremake initscripts ipfiremake whatmask - ipfiremake libmnl - ipfiremake iptables ipfiremake conntrack-tools ipfiremake libupnp ipfiremake ipaddr @@ -572,7 +601,6 @@ buildipfire() { ipfiremake python-mechanize ipfiremake python-feedparser ipfiremake python-rssdler - ipfiremake libffi ipfiremake glib ipfiremake GeoIP ipfiremake fwhits @@ -620,6 +648,7 @@ buildipfire() { ipfiremake screen ipfiremake smartmontools ipfiremake htop + ipfiremake chkconfig ipfiremake postfix ipfiremake fetchmail ipfiremake cyrus-imapd @@ -627,6 +656,7 @@ buildipfire() { ipfiremake clamav ipfiremake spamassassin ipfiremake amavisd + ipfiremake dma ipfiremake alsa ipfiremake mpfire ipfiremake guardian @@ -641,6 +671,7 @@ buildipfire() { ipfiremake libshout ipfiremake xvid ipfiremake libmpeg2 + ipfiremake libarchive ipfiremake cmake ipfiremake gnump3d ipfiremake rsync @@ -653,7 +684,6 @@ buildipfire() { ipfiremake ncftp ipfiremake etherwake ipfiremake bwm-ng - ipfiremake tripwire ipfiremake sysstat ipfiremake vsftpd ipfiremake strongswan @@ -667,6 +697,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 @@ -695,6 +730,11 @@ buildipfire() { ipfiremake mpd ipfiremake libmpdclient ipfiremake mpc + 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 @@ -716,7 +756,7 @@ buildipfire() { ipfiremake streamripper ipfiremake sshfs ipfiremake taglib - ipfiremake mediatomb + #ipfiremake mediatomb ipfiremake sslh ipfiremake perl-gettext ipfiremake perl-Sort-Naturally @@ -810,8 +850,14 @@ buildipfire() { ipfiremake squid-accounting ipfiremake pigz ipfiremake tmux + ipfiremake perl-Text-CSV_XS ipfiremake swconfig ipfiremake haproxy + ipfiremake ipset + ipfiremake lua + ipfiremake dnsdist + ipfiremake bird + ipfiremake dmidecode } buildinstaller() { @@ -868,6 +914,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 @@ -971,7 +1021,7 @@ build) cd $BASEDIR tools/checknewlog.pl - tools/checkwronginitlinks + tools/checkrootfiles cd $PWD beautify build_end