X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=9893fbb20e5a0099510445c8a0094f65e5019e56;hp=8ef205668c4387ece19edef9dc76a59414e983d0;hb=27267889aa791b5c4683f62fe823ab96fb42fe8a;hpb=405ee2b40088208849df0644c46cf4f412919541 diff --git a/make.sh b/make.sh index 8ef205668c..9893fbb20e 100755 --- a/make.sh +++ b/make.sh @@ -17,7 +17,7 @@ # 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-2017 IPFire Team . # +# Copyright (C) 2007-2018 IPFire Team . # # # ############################################################################ # @@ -25,8 +25,8 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.19" # Version number -CORE="117" # Core Level (Filename) -PAKFIRE_CORE="116" # Core Level (PAKFIRE) +CORE="121" # Core Level (Filename) +PAKFIRE_CORE="120" # 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 @@ -37,7 +37,7 @@ 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=20171121 +TOOLCHAINVER=20180213 ############################################################################### # @@ -70,8 +70,8 @@ resize_terminal() { NAME_WIDTH=$(( COLUMNS - OPTIONS_WIDTH - TIME_WIDTH - STATUS_WIDTH )) LINE_WIDTH=$(( COLUMNS - STATUS_WIDTH )) - TIME_COL=$(( COLUMNS - TIME_WIDTH - STATUS_WIDTH )) - STATUS_COL=$(( COLUMNS - STATUS_WIDTH )) + TIME_COL=$(( NAME_WIDTH + OPTIONS_WIDTH )) + STATUS_COL=$(( TIME_COL + TIME_WIDTH )) } # Initially setup terminal @@ -144,14 +144,14 @@ configure_build() { BUILDTARGET="${build_arch}-unknown-linux-gnu" CROSSTARGET="${build_arch}-cross-linux-gnu" BUILD_PLATFORM="x86" - CFLAGS_ARCH="-m64 -mtune=generic" + CFLAGS_ARCH="-m64 -mindirect-branch=thunk -mfunction-return=thunk -mtune=generic" ;; i586) BUILDTARGET="${build_arch}-pc-linux-gnu" CROSSTARGET="${build_arch}-cross-linux-gnu" BUILD_PLATFORM="x86" - CFLAGS_ARCH="-march=i586 -mtune=generic -fomit-frame-pointer" + CFLAGS_ARCH="-march=i586 -mindirect-branch=thunk -mfunction-return=thunk -mtune=generic -fomit-frame-pointer" ;; aarch64) @@ -195,7 +195,7 @@ configure_build() { TOOLS_DIR="/tools_${BUILD_ARCH}" # Enables hardening - HARDENING_CFLAGS="-Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong --param=ssp-buffer-size=4" + HARDENING_CFLAGS="-Wp,-D_FORTIFY_SOURCE=2 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong" CFLAGS="-O2 -pipe -Wall -fexceptions -fPIC ${CFLAGS_ARCH}" CXXFLAGS="${CFLAGS}" @@ -208,7 +208,7 @@ configure_build() { local mem_max=$(( ${HOST_MEM} / 192 )) local processors="$(system_processors)" - local cpu_max=$(( ${processors} * 2 )) + local cpu_max=$(( ${processors} + 1 )) local parallelism if [ ${mem_max} -lt ${cpu_max} ]; then @@ -217,6 +217,12 @@ configure_build() { parallelism=${cpu_max} fi + # limit to -j23 because perl will not build + # more + if [ ${parallelism} -gt 23 ]; then + parallelism=23 + fi + MAKETUNING="-j${parallelism}" fi } @@ -322,12 +328,7 @@ print_package() { fi printf "%-$(( ${NAME_WIDTH} - 1 ))s " "${string}" - - if [ -n "${options}" ]; then - printf "[ %-$(( ${OPTIONS_WIDTH} - 4 ))s ]" "${options}" - else - printf "%${OPTIONS_WIDTH}s" "" - fi + printf "%$(( ${OPTIONS_WIDTH} - 1 ))s " "${options}" } print_runtime() { @@ -415,7 +416,7 @@ prepareenv() { # Checking if running as root user if [ $(id -u) -ne 0 ]; then - exiterror "Not building as root" + exiterror "root privileges required for building" fi # Checking for necessary temporary space @@ -438,19 +439,6 @@ prepareenv() { # Set LFS Directory LFS=$BASEDIR/build - # Check ${TOOLS_DIR} symlink - if [ -h "${TOOLS_DIR}" ]; then - rm -f "${TOOLS_DIR}" - fi - - if [ ! -e "${TOOLS_DIR}" ]; then - ln -s "${BASEDIR}/build${TOOLS_DIR}" "${TOOLS_DIR}" - fi - - if [ ! -h "${TOOLS_DIR}" ]; then - exiterror "Could not create ${TOOLS_DIR} symbolic link" - fi - # Setup environment set +h LC_ALL=POSIX @@ -538,6 +526,7 @@ enterchroot() { CCACHE_COMPRESS="${CCACHE_COMPRESS}" \ CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \ KVER="${KVER}" \ + XZ_OPT="${XZ_OPT}" \ $(fake_environ) \ $(qemu_environ) \ "$@" @@ -549,7 +538,7 @@ entershell() { fi echo "Entering to a shell inside LFS chroot, go out with exit" - local PS1="ipfire build chroot ($(uname -m)) \u:\w\$ " + local PS1="ipfire build chroot (${BUILD_ARCH}) \u:\w\$ " if enterchroot bash -i; then stdumount @@ -645,7 +634,7 @@ lfsmake2() { local PS1='\u:\w$ ' enterchroot \ - bash -x -c "cd /usr/src/lfs && \ + ${EXTRA_PATH}bash -x -c "cd /usr/src/lfs && \ MAKETUNING=${MAKETUNING} \ make -f $* \ LFS_BASEDIR=/usr/src install" \ @@ -872,6 +861,21 @@ fi # Get the amount of memory in this build system HOST_MEM=$(system_memory) +# Checking host memory, tuning XZ_OPT + +if [ $HOST_MEM -lt 1024 ]; then + print_build_stage "Host-Memory: $HOST_MEM MiB" + print_build_stage "Not enough host memory (less than 1024 MiB, please consider upgrading)" + + exit 1 + +else + + XZ_MEM="$(( HOST_MEM * 7 / 10 ))MiB" + XZ_OPT="-T4 -8 --memory=$XZ_MEM" + +fi + if [ -n "${BUILD_ARCH}" ]; then configure_build "${BUILD_ARCH}" else @@ -915,6 +919,19 @@ buildtoolchain() { exiterror "Could not find GCC. You will need a working build enviroment in order to build the toolchain." fi + # Check ${TOOLS_DIR} symlink + if [ -h "${TOOLS_DIR}" ]; then + rm -f "${TOOLS_DIR}" + fi + + if [ ! -e "${TOOLS_DIR}" ]; then + ln -s "${BASEDIR}/build${TOOLS_DIR}" "${TOOLS_DIR}" + fi + + if [ ! -h "${TOOLS_DIR}" ]; then + exiterror "Could not create ${TOOLS_DIR} symbolic link" + fi + LOGFILE="$BASEDIR/log/_build.toolchain.log" export LOGFILE @@ -927,6 +944,7 @@ buildtoolchain() { lfsmake1 gcc PASS=L lfsmake1 binutils PASS=2 lfsmake1 gcc PASS=2 + lfsmake1 zlib lfsmake1 ccache PASS=2 lfsmake1 tcl lfsmake1 expect @@ -951,7 +969,10 @@ buildtoolchain() { lfsmake1 tar lfsmake1 texinfo lfsmake1 xz + lfsmake1 bison + lfsmake1 flex lfsmake1 fake-environ + lfsmake1 strip lfsmake1 cleanup-toolchain } @@ -980,7 +1001,6 @@ buildbase() { lfsmake2 iana-etc lfsmake2 m4 lfsmake2 bison - lfsmake2 ncurses-compat lfsmake2 ncurses lfsmake2 procps lfsmake2 libtool @@ -1007,6 +1027,7 @@ buildbase() { lfsmake2 jwhois lfsmake2 kbd lfsmake2 less + lfsmake2 pkg-config lfsmake2 make lfsmake2 man lfsmake2 kmod @@ -1031,7 +1052,6 @@ buildipfire() { lfsmake2 configroot lfsmake2 initscripts lfsmake2 backup - lfsmake2 pkg-config lfsmake2 libusb lfsmake2 libusb-compat lfsmake2 libpcap @@ -1040,13 +1060,12 @@ buildipfire() { lfsmake2 unzip lfsmake2 which lfsmake2 linux-firmware - lfsmake2 ath10k-firmware lfsmake2 dvb-firmwares - lfsmake2 mt7601u-firmware + lfsmake2 xr819-firmware lfsmake2 zd1211-firmware lfsmake2 rpi-firmware lfsmake2 bc - lfsmake2 u-boot + lfsmake2 u-boot MKIMAGE=1 lfsmake2 cpio lfsmake2 mdadm lfsmake2 dracut @@ -1061,73 +1080,69 @@ buildipfire() { lfsmake2 libnetfilter_cthelper lfsmake2 libnetfilter_cttimeout lfsmake2 iptables + lfsmake2 screen + lfsmake2 elfutils case "${BUILD_ARCH}" in x86_64) lfsmake2 linux KCFG="" - lfsmake2 backports KCFG="" - lfsmake2 e1000e KCFG="" - lfsmake2 igb KCFG="" - lfsmake2 ixgbe KCFG="" +# lfsmake2 backports KCFG="" +# lfsmake2 e1000e KCFG="" +# lfsmake2 igb KCFG="" +# lfsmake2 ixgbe KCFG="" lfsmake2 xtables-addons KCFG="" lfsmake2 linux-initrd KCFG="" ;; i586) # x86-pae (Native and new XEN) kernel build lfsmake2 linux KCFG="-pae" - lfsmake2 backports KCFG="-pae" - lfsmake2 e1000e KCFG="-pae" - lfsmake2 igb KCFG="-pae" - lfsmake2 ixgbe KCFG="-pae" +# lfsmake2 backports KCFG="-pae" +# lfsmake2 e1000e KCFG="-pae" +# lfsmake2 igb KCFG="-pae" +# lfsmake2 ixgbe KCFG="-pae" lfsmake2 xtables-addons KCFG="-pae" lfsmake2 linux-initrd KCFG="-pae" # x86 kernel build lfsmake2 linux KCFG="" - lfsmake2 backports KCFG="" - lfsmake2 e1000e KCFG="" - lfsmake2 igb KCFG="" - lfsmake2 ixgbe KCFG="" +# lfsmake2 backports KCFG="" +# lfsmake2 e1000e KCFG="" +# lfsmake2 igb KCFG="" +# lfsmake2 ixgbe KCFG="" lfsmake2 xtables-addons KCFG="" lfsmake2 linux-initrd KCFG="" ;; armv5tel) - # arm-rpi (Raspberry Pi) kernel build - lfsmake2 linux KCFG="-rpi" - lfsmake2 backports KCFG="-rpi" - lfsmake2 xtables-addons KCFG="-rpi" - lfsmake2 linux-initrd KCFG="-rpi" + # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build + lfsmake2 linux KCFG="-kirkwood" +# lfsmake2 backports KCFG="-kirkwood" +# lfsmake2 e1000e KCFG="-kirkwood" +# lfsmake2 igb KCFG="-kirkwood" +# lfsmake2 ixgbe KCFG="-kirkwood" + lfsmake2 xtables-addons KCFG="-kirkwood" + lfsmake2 linux-initrd KCFG="-kirkwood" # arm multi platform (Panda, Wandboard ...) kernel build lfsmake2 linux KCFG="-multi" - lfsmake2 backports KCFG="-multi" - lfsmake2 e1000e KCFG="-multi" - lfsmake2 igb KCFG="-multi" - lfsmake2 ixgbe KCFG="-multi" +# lfsmake2 backports KCFG="-multi" +# lfsmake2 e1000e KCFG="-multi" +# lfsmake2 igb KCFG="-multi" +# lfsmake2 ixgbe KCFG="-multi" lfsmake2 xtables-addons KCFG="-multi" lfsmake2 linux-initrd KCFG="-multi" - - # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build - lfsmake2 linux KCFG="-kirkwood" - lfsmake2 backports KCFG="-kirkwood" - lfsmake2 e1000e KCFG="-kirkwood" - lfsmake2 igb KCFG="-kirkwood" - lfsmake2 ixgbe KCFG="-kirkwood" - lfsmake2 xtables-addons KCFG="-kirkwood" - lfsmake2 linux-initrd KCFG="-kirkwood" ;; esac lfsmake2 xtables-addons USPACE="1" lfsmake2 openssl [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2' + lfsmake2 openssl-compat lfsmake2 libgpg-error lfsmake2 libgcrypt lfsmake2 libassuan lfsmake2 nettle lfsmake2 libevent lfsmake2 libevent2 - lfsmake2 libevent2-compat lfsmake2 expat lfsmake2 apr lfsmake2 aprutil @@ -1172,11 +1187,9 @@ buildipfire() { lfsmake2 libxml2 lfsmake2 libxslt lfsmake2 BerkeleyDB - lfsmake2 mysql lfsmake2 cyrus-sasl lfsmake2 openldap lfsmake2 apache2 - lfsmake2 php lfsmake2 web-user-interface lfsmake2 flag-icons lfsmake2 jquery @@ -1209,8 +1222,6 @@ buildipfire() { lfsmake2 ipaddr lfsmake2 iputils lfsmake2 l7-protocols - lfsmake2 mISDNuser - lfsmake2 capi4k-utils lfsmake2 hwdata lfsmake2 logrotate lfsmake2 logwatch @@ -1254,7 +1265,6 @@ buildipfire() { lfsmake2 python-ipaddress lfsmake2 glib lfsmake2 GeoIP - lfsmake2 noip_updater lfsmake2 ntp lfsmake2 openssh lfsmake2 fontconfig @@ -1280,9 +1290,9 @@ buildipfire() { lfsmake2 wireless lfsmake2 pakfire lfsmake2 spandsp + lfsmake2 lz4 lfsmake2 lzo lfsmake2 openvpn - lfsmake2 pammysql lfsmake2 mpage lfsmake2 dbus lfsmake2 intltool @@ -1303,14 +1313,13 @@ buildipfire() { lfsmake2 mc lfsmake2 wget lfsmake2 bridge-utils - lfsmake2 screen +# lfsmake2 screen lfsmake2 smartmontools lfsmake2 htop lfsmake2 chkconfig lfsmake2 postfix lfsmake2 fetchmail lfsmake2 cyrus-imapd - lfsmake2 openmailadmin lfsmake2 clamav lfsmake2 spamassassin lfsmake2 amavisd @@ -1333,7 +1342,6 @@ buildipfire() { lfsmake2 cmake lfsmake2 gnump3d lfsmake2 rsync - lfsmake2 tcpwrapper lfsmake2 libtirpc lfsmake2 rpcbind lfsmake2 nfs @@ -1364,11 +1372,9 @@ buildipfire() { lfsmake2 qemu lfsmake2 sane lfsmake2 netpbm - lfsmake2 phpSANE - lfsmake2 tunctl lfsmake2 netsnmpd - lfsmake2 nagios lfsmake2 nagios_nrpe + lfsmake2 nagios-plugins lfsmake2 icinga lfsmake2 ebtables lfsmake2 directfb @@ -1411,19 +1417,15 @@ buildipfire() { lfsmake2 streamripper lfsmake2 sshfs lfsmake2 taglib - #lfsmake2 mediatomb lfsmake2 sslh lfsmake2 perl-gettext lfsmake2 perl-Sort-Naturally lfsmake2 vdradmin lfsmake2 miau lfsmake2 perl-DBI - lfsmake2 perl-DBD-mysql lfsmake2 perl-DBD-SQLite lfsmake2 perl-File-ReadBackwards - lfsmake2 cacti lfsmake2 openvmtools - lfsmake2 nagiosql lfsmake2 motion lfsmake2 joe lfsmake2 monit @@ -1431,8 +1433,8 @@ buildipfire() { lfsmake2 watchdog lfsmake2 libpri lfsmake2 libsrtp + lfsmake2 jansson lfsmake2 asterisk - lfsmake2 lcr lfsmake2 usb_modeswitch lfsmake2 usb_modeswitch_data lfsmake2 zerofree @@ -1443,6 +1445,9 @@ buildipfire() { lfsmake2 powertop lfsmake2 parted lfsmake2 swig + lfsmake2 u-boot + lfsmake2 u-boot-kirkwood + lfsmake2 python-typing lfsmake2 python-m2crypto lfsmake2 wireless-regdb lfsmake2 crda @@ -1472,7 +1477,6 @@ buildipfire() { lfsmake2 sendEmail lfsmake2 sysbench lfsmake2 strace - lfsmake2 elfutils lfsmake2 ltrace lfsmake2 ipfire-netboot lfsmake2 lcdproc @@ -1492,7 +1496,6 @@ buildipfire() { lfsmake2 iptraf-ng lfsmake2 iotop lfsmake2 stunnel - lfsmake2 owncloud lfsmake2 bacula lfsmake2 batctl lfsmake2 perl-Font-TTF @@ -1502,7 +1505,6 @@ buildipfire() { lfsmake2 pigz lfsmake2 tmux lfsmake2 perl-Text-CSV_XS - lfsmake2 swconfig lfsmake2 haproxy lfsmake2 ipset lfsmake2 lua @@ -1515,13 +1517,14 @@ buildipfire() { lfsmake2 libpciaccess lfsmake2 libyajl lfsmake2 libvirt - lfsmake2 python3-libvirt lfsmake2 freeradius lfsmake2 perl-common-sense lfsmake2 perl-inotify2 lfsmake2 perl-Net-IP lfsmake2 wio lfsmake2 iftop + lfsmake2 mdns-repeater + lfsmake2 i2c-tools } buildinstaller() { @@ -1530,7 +1533,8 @@ buildinstaller() { export LOGFILE lfsmake2 memtest lfsmake2 installer - lfsmake1 strip + # use toolchain bash for chroot to strip + EXTRA_PATH=${TOOLS_DIR}/bin/ lfsmake2 strip } buildpackages() { @@ -1567,7 +1571,6 @@ buildpackages() { modprobe loop 2>/dev/null if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ] || [ -e "/dev/loop-control" ]); then lfsmake2 flash-images - lfsmake2 flash-images SCON=1 fi mv $LFS/install/images/{*.iso,*.tgz,*.img.gz,*.bz2} $BASEDIR >> $LOGFILE 2>&1 @@ -1773,7 +1776,7 @@ toolchain) buildtoolchain echo "`date -u '+%b %e %T'`: Create toolchain image for ${BUILD_ARCH}" | tee -a $LOGFILE test -d $BASEDIR/cache/toolchains || mkdir -p $BASEDIR/cache/toolchains - cd $BASEDIR && XZ_OPT="-T0 -8" tar -Jc --exclude='log/_build.*.log' -f cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.tar.xz \ + cd $BASEDIR && XZ_OPT="$(XZ_OPT)" tar -Jc --exclude='log/_build.*.log' -f cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.tar.xz --xz \ build/${TOOLS_DIR} build/bin/sh log >> $LOGFILE md5sum cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.tar.xz \ > cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.md5