X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=a41db5413659bd82952ca780751bf860d53be183;hp=84278392227194ccfce7dc56f3bfba827e66dd94;hb=37b86fa99bde0c79fe45ffaf90732c9b6025b7b9;hpb=543286056ee211d4018b93cb866a63d2686a16dc diff --git a/make.sh b/make.sh index 8427839222..a41db54136 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="119" # Core Level (Filename) +PAKFIRE_CORE="119" # 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 ############################################################################### # @@ -52,27 +52,33 @@ else INTERACTIVE=false fi -## Screen Dimentions -# Find current screen size -if [ -z "${COLUMNS}" ]; then - COLUMNS=$(stty size) - COLUMNS=${COLUMNS##* } -fi +# Sets or adjusts pretty formatting variables +resize_terminal() { + ## Screen Dimentions + # Find current screen size + COLUMNS=$(tput cols) -# When using remote connections, such as a serial port, stty size returns 0 -if ! ${INTERACTIVE} || [ "${COLUMNS}" = "0" ]; then - COLUMNS=80 -fi + # When using remote connections, such as a serial port, stty size returns 0 + if ! ${INTERACTIVE} || [ "${COLUMNS}" = "0" ]; then + COLUMNS=80 + fi -## Measurements for positioning result messages -OPTIONS_WIDTH=20 -TIME_WIDTH=12 -STATUS_WIDTH=8 -NAME_WIDTH=$(( COLUMNS - OPTIONS_WIDTH - TIME_WIDTH - STATUS_WIDTH )) -LINE_WIDTH=$(( COLUMNS - STATUS_WIDTH )) + # Measurements for positioning result messages + OPTIONS_WIDTH=20 + TIME_WIDTH=12 + STATUS_WIDTH=8 + 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 +resize_terminal + +# Call resize_terminal when terminal is being resized +trap "resize_terminal" WINCH # Define color for messages BOLD="\\033[1;39m" @@ -138,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) @@ -189,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}" @@ -202,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 @@ -211,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 } @@ -316,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() { @@ -369,7 +376,7 @@ exiterror() { done # Dump logfile - if [ -n "${LOGFILE}" ]; then + if [ -n "${LOGFILE}" ] && [ -e "${LOGFILE}" ]; then echo # empty line local line @@ -432,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 @@ -543,7 +537,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 @@ -567,6 +561,7 @@ lfsmakecommoncheck() { if grep "^SUP_ARCH" ${BASEDIR}/lfs/${1} >/dev/null; then # Check if package supports ${BUILD_ARCH} or all architectures. if ! grep -E "^SUP_ARCH.*${BUILD_ARCH}|^SUP_ARCH.*all" ${BASEDIR}/lfs/${1} >/dev/null; then + print_runtime 0 print_status SKIP return 1 fi @@ -638,7 +633,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" \ @@ -908,6 +903,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 @@ -920,6 +928,7 @@ buildtoolchain() { lfsmake1 gcc PASS=L lfsmake1 binutils PASS=2 lfsmake1 gcc PASS=2 + lfsmake1 zlib lfsmake1 ccache PASS=2 lfsmake1 tcl lfsmake1 expect @@ -944,7 +953,10 @@ buildtoolchain() { lfsmake1 tar lfsmake1 texinfo lfsmake1 xz + lfsmake1 bison + lfsmake1 flex lfsmake1 fake-environ + lfsmake1 strip lfsmake1 cleanup-toolchain } @@ -973,7 +985,6 @@ buildbase() { lfsmake2 iana-etc lfsmake2 m4 lfsmake2 bison - lfsmake2 ncurses-compat lfsmake2 ncurses lfsmake2 procps lfsmake2 libtool @@ -1000,6 +1011,7 @@ buildbase() { lfsmake2 jwhois lfsmake2 kbd lfsmake2 less + lfsmake2 pkg-config lfsmake2 make lfsmake2 man lfsmake2 kmod @@ -1024,7 +1036,6 @@ buildipfire() { lfsmake2 configroot lfsmake2 initscripts lfsmake2 backup - lfsmake2 pkg-config lfsmake2 libusb lfsmake2 libusb-compat lfsmake2 libpcap @@ -1033,13 +1044,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 @@ -1054,61 +1064,56 @@ buildipfire() { lfsmake2 libnetfilter_cthelper lfsmake2 libnetfilter_cttimeout lfsmake2 iptables + 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" @@ -1120,7 +1125,6 @@ buildipfire() { lfsmake2 nettle lfsmake2 libevent lfsmake2 libevent2 - lfsmake2 libevent2-compat lfsmake2 expat lfsmake2 apr lfsmake2 aprutil @@ -1165,11 +1169,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 @@ -1202,8 +1204,6 @@ buildipfire() { lfsmake2 ipaddr lfsmake2 iputils lfsmake2 l7-protocols - lfsmake2 mISDNuser - lfsmake2 capi4k-utils lfsmake2 hwdata lfsmake2 logrotate lfsmake2 logwatch @@ -1273,9 +1273,9 @@ buildipfire() { lfsmake2 wireless lfsmake2 pakfire lfsmake2 spandsp + lfsmake2 lz4 lfsmake2 lzo lfsmake2 openvpn - lfsmake2 pammysql lfsmake2 mpage lfsmake2 dbus lfsmake2 intltool @@ -1303,7 +1303,6 @@ buildipfire() { lfsmake2 postfix lfsmake2 fetchmail lfsmake2 cyrus-imapd - lfsmake2 openmailadmin lfsmake2 clamav lfsmake2 spamassassin lfsmake2 amavisd @@ -1326,7 +1325,6 @@ buildipfire() { lfsmake2 cmake lfsmake2 gnump3d lfsmake2 rsync - lfsmake2 tcpwrapper lfsmake2 libtirpc lfsmake2 rpcbind lfsmake2 nfs @@ -1336,7 +1334,6 @@ buildipfire() { lfsmake2 etherwake lfsmake2 bwm-ng lfsmake2 sysstat - lfsmake2 vsftpd lfsmake2 strongswan lfsmake2 rng-tools lfsmake2 lsof @@ -1358,11 +1355,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 @@ -1405,19 +1400,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 @@ -1425,12 +1416,11 @@ buildipfire() { lfsmake2 watchdog lfsmake2 libpri lfsmake2 libsrtp + lfsmake2 jansson lfsmake2 asterisk - lfsmake2 lcr lfsmake2 usb_modeswitch lfsmake2 usb_modeswitch_data lfsmake2 zerofree - lfsmake2 pound lfsmake2 minicom lfsmake2 ddrescue lfsmake2 miniupnpd @@ -1438,6 +1428,7 @@ buildipfire() { lfsmake2 powertop lfsmake2 parted lfsmake2 swig + lfsmake2 u-boot lfsmake2 python-m2crypto lfsmake2 wireless-regdb lfsmake2 crda @@ -1467,7 +1458,6 @@ buildipfire() { lfsmake2 sendEmail lfsmake2 sysbench lfsmake2 strace - lfsmake2 elfutils lfsmake2 ltrace lfsmake2 ipfire-netboot lfsmake2 lcdproc @@ -1487,8 +1477,6 @@ buildipfire() { lfsmake2 iptraf-ng lfsmake2 iotop lfsmake2 stunnel - lfsmake2 sslscan - lfsmake2 owncloud lfsmake2 bacula lfsmake2 batctl lfsmake2 perl-Font-TTF @@ -1498,7 +1486,6 @@ buildipfire() { lfsmake2 pigz lfsmake2 tmux lfsmake2 perl-Text-CSV_XS - lfsmake2 swconfig lfsmake2 haproxy lfsmake2 ipset lfsmake2 lua @@ -1511,13 +1498,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() { @@ -1526,7 +1514,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() { @@ -1536,7 +1525,7 @@ buildpackages() { # Generating list of packages used - echo -n "Generating packages list from logs" | tee -a $LOGFILE + print_line "Generating packages list from logs" rm -f $BASEDIR/doc/packages-list for i in `ls -1tr $BASEDIR/log/[^_]*`; do if [ "$i" != "$BASEDIR/log/FILES" -a -n $i ]; then @@ -1587,19 +1576,6 @@ buildpackages() { stdumount rm -rf $BASEDIR/build/tmp/* - # Generating total list of files - echo -n "Generating files list from logs" | tee -a $LOGFILE - rm -f $BASEDIR/log/FILES - for i in `ls -1tr $BASEDIR/log/[^_]*`; do - if [ "$i" != "$BASEDIR/log/FILES" -a -n $i ]; then - echo "##" >>$BASEDIR/log/FILES - echo "## `basename $i`" >>$BASEDIR/log/FILES - echo "##" >>$BASEDIR/log/FILES - cat $i | sed "s%^\./%#%" | sort >> $BASEDIR/log/FILES - fi - done - print_status DONE - cd $PWD } @@ -1778,7 +1754,7 @@ toolchain) ${INTERACTIVE} && clear prepareenv - print_build_stage "Toolchain compilation" + print_build_stage "Toolchain compilation (${BUILD_ARCH})" 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