X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=make.sh;h=03361d2377b9ea452a232b8329fa2a1d6337825f;hb=150378eae9b19e04c36392ada2281eb1849a8ae8;hp=98a5cf8303f2df4f705463897ff9f0f9118513cc;hpb=e0dbe21e095efe06e4649857f52fe674a463db09;p=ipfire-2.x.git diff --git a/make.sh b/make.sh index 98a5cf8303..03361d2377 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-2019 IPFire Team . # +# Copyright (C) 2007-2020 IPFire Team . # # # ############################################################################ # @@ -26,8 +26,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name # If you update the version don't forget to update backupiso and add it to core update VERSION="2.25" # Version number -CORE="142" # Core Level (Filename) -PAKFIRE_CORE="141" # Core Level (PAKFIRE) +CORE="153" # Core Level (Filename) SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir NICE=10 # Nice level @@ -40,7 +39,7 @@ GIT_BRANCH="$(git rev-parse --abbrev-ref HEAD)" # Git Branch GIT_TAG="$(git tag | tail -1)" # Git Tag GIT_LASTCOMMIT="$(git rev-parse --verify HEAD)" # Last commit -TOOLCHAINVER=20200108 +TOOLCHAINVER=20200924 ############################################################################### # @@ -147,21 +146,21 @@ configure_build() { BUILDTARGET="${build_arch}-unknown-linux-gnu" CROSSTARGET="${build_arch}-cross-linux-gnu" BUILD_PLATFORM="x86" - CFLAGS_ARCH="-m64 -mindirect-branch=thunk -mfunction-return=thunk -mtune=generic" + CFLAGS_ARCH="-m64 -mtune=generic -fstack-clash-protection -fcf-protection" ;; i586) BUILDTARGET="${build_arch}-pc-linux-gnu" CROSSTARGET="${build_arch}-cross-linux-gnu" BUILD_PLATFORM="x86" - CFLAGS_ARCH="-march=i586 -mindirect-branch=thunk -mfunction-return=thunk -mtune=generic -fomit-frame-pointer" + CFLAGS_ARCH="-march=i586 -mtune=generic -fomit-frame-pointer" ;; aarch64) BUILDTARGET="${build_arch}-unknown-linux-gnu" CROSSTARGET="${build_arch}-cross-linux-gnu" BUILD_PLATFORM="arm" - CFLAGS_ARCH="" + CFLAGS_ARCH="-fstack-clash-protection" ;; armv7hl) @@ -286,6 +285,7 @@ stdumount() { umount $BASEDIR/build/usr/src/log 2>/dev/null; umount $BASEDIR/build/usr/src/src 2>/dev/null; umount $BASEDIR/build/usr/src 2>/dev/null; + umount $BASEDIR/build/tmp 2>/dev/null; } now() { @@ -476,7 +476,10 @@ prepareenv() { if [ "${ENABLE_RAMDISK}" = "on" ]; then mkdir -p $BASEDIR/build/usr/src - mount -t tmpfs tmpfs -o size=4G,nr_inodes=1M,mode=1777 $BASEDIR/build/usr/src + mount -t tmpfs tmpfs -o size=8G,nr_inodes=1M,mode=1777 $BASEDIR/build/usr/src + + mkdir -p ${BASEDIR}/build/tmp + mount -t tmpfs tmpfs -o size=4G,nr_inodes=1M,mode=1777 ${BASEDIR}/build/tmp fi mkdir -p $BASEDIR/build/usr/src/{cache,config,doc,html,langs,lfs,log,src,ccache} @@ -502,6 +505,7 @@ prepareenv() { # Run LFS static binary creation scripts one by one export CCACHE_DIR=$BASEDIR/ccache + export CCACHE_TEMPDIR="/tmp" export CCACHE_COMPRESS=1 export CCACHE_COMPILERCHECK="string:toolchain-${TOOLCHAINVER} ${BUILD_ARCH}" @@ -516,7 +520,7 @@ prepareenv() { system_release="${system_release} - ${GIT_BRANCH}" ;; *) - system_release="${system_release} - Development Build: ${GIT_BRANCH}/${GIT_LASTCOMMIT:0:8}" + system_release="${system_release} - core${CORE} Development Build: ${GIT_BRANCH}/${GIT_LASTCOMMIT:0:8}" ;; esac @@ -557,7 +561,6 @@ enterchroot() { PS1="${PS1}" \ PATH="${PATH}" \ SYSTEM_RELEASE="${SYSTEM_RELEASE}" \ - PAKFIRE_CORE="${PAKFIRE_CORE}" \ PAKFIRE_TREE="${PAKFIRE_TREE}" \ NAME="${NAME}" \ SNAME="${SNAME}" \ @@ -574,6 +577,7 @@ enterchroot() { BUILD_ARCH="${BUILD_ARCH}" \ BUILD_PLATFORM="${BUILD_PLATFORM}" \ CCACHE_DIR=/usr/src/ccache \ + CCACHE_TEMPDIR="${CCACHE_TEMPDIR}" \ CCACHE_COMPRESS="${CCACHE_COMPRESS}" \ CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \ GOCACHE="/usr/src/ccache/go" \ @@ -657,6 +661,7 @@ lfsmake1() { cd $BASEDIR/lfs && env -i \ PATH="${TOOLS_DIR}/ccache/bin:${TOOLS_DIR}/bin:$PATH" \ CCACHE_DIR="${CCACHE_DIR}" \ + CCACHE_TEMPDIR="${CCACHE_TEMPDIR}" \ CCACHE_COMPRESS="${CCACHE_COMPRESS}" \ CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \ CFLAGS="${CFLAGS}" \ @@ -799,7 +804,7 @@ qemu_is_required() { fi case "${HOST_ARCH},${build_arch}" in - x86_64,arm*|i?86,arm*|i?86,x86_64) + x86_64,arm*|x86_64,aarch64|i?86,arm*|i?86,aarch64|i?86,x86_64) return 0 ;; *) @@ -857,6 +862,9 @@ qemu_find_build_helper_name() { local magic case "${build_arch}" in + aarch64) + magic="7f454c460201010000000000000000000200b700" + ;; arm*) magic="7f454c4601010100000000000000000002002800" ;; @@ -1079,6 +1087,7 @@ buildbase() { lfsmake2 autoconf lfsmake2 automake lfsmake2 berkeley + lfsmake2 berkeley-compat lfsmake2 coreutils lfsmake2 iana-etc lfsmake2 m4 @@ -1101,6 +1110,7 @@ buildbase() { lfsmake2 flex lfsmake2 gawk lfsmake2 gettext + lfsmake2 go lfsmake2 grep lfsmake2 groff lfsmake2 gperf @@ -1113,7 +1123,6 @@ buildbase() { lfsmake2 pkg-config lfsmake2 make lfsmake2 man - lfsmake2 kmod lfsmake2 net-tools lfsmake2 patch lfsmake2 psmisc @@ -1123,7 +1132,6 @@ buildbase() { lfsmake2 tar lfsmake2 texinfo lfsmake2 util-linux - lfsmake2 udev lfsmake2 vim } @@ -1135,6 +1143,8 @@ buildipfire() { lfsmake2 backup lfsmake2 openssl [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2' + lfsmake2 kmod + lfsmake2 udev lfsmake2 popt lfsmake2 libedit lfsmake2 libusb @@ -1181,15 +1191,6 @@ buildipfire() { 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 xtables-addons KCFG="-pae" - lfsmake2 linux-initrd KCFG="-pae" - # x86 kernel build lfsmake2 linux KCFG="" # lfsmake2 backports KCFG="" @@ -1248,8 +1249,11 @@ buildipfire() { lfsmake2 libnl-3 lfsmake2 libidn lfsmake2 nasm + lfsmake2 libarchive + lfsmake2 cmake lfsmake2 libjpeg lfsmake2 libjpeg-compat + lfsmake2 openjpeg lfsmake2 libexif lfsmake2 libpng lfsmake2 libtiff @@ -1276,8 +1280,6 @@ buildipfire() { lfsmake2 bootstrap lfsmake2 arping lfsmake2 beep - lfsmake2 libarchive - lfsmake2 cmake lfsmake2 libssh lfsmake2 cdrkit lfsmake2 dosfstools @@ -1294,11 +1296,13 @@ buildipfire() { lfsmake2 perl-Device-SerialPort lfsmake2 perl-Device-Modem lfsmake2 perl-Apache-Htpasswd + lfsmake2 perl-Parse-Yapp lfsmake2 gnupg lfsmake2 hdparm lfsmake2 sdparm lfsmake2 mtools lfsmake2 whatmask + lfsmake2 libtirpc lfsmake2 conntrack-tools lfsmake2 libupnp lfsmake2 ipaddr @@ -1334,7 +1338,6 @@ buildipfire() { lfsmake2 Archive-Tar lfsmake2 Archive-Zip lfsmake2 Text-Tabs+Wrap - lfsmake2 Locale-Country lfsmake2 XML-Parser lfsmake2 Crypt-PasswdMD5 lfsmake2 Net-Telnet @@ -1348,8 +1351,6 @@ buildipfire() { lfsmake2 python-daemon lfsmake2 python-ipaddress lfsmake2 glib - lfsmake2 GeoIP - lfsmake2 geoip-database lfsmake2 ntp lfsmake2 openssh lfsmake2 fontconfig @@ -1383,6 +1384,7 @@ buildipfire() { lfsmake2 spandsp lfsmake2 lz4 lfsmake2 lzo + lfsmake2 zstd lfsmake2 openvpn lfsmake2 mpage lfsmake2 dbus @@ -1394,13 +1396,16 @@ buildipfire() { lfsmake2 ghostscript lfsmake2 qpdf lfsmake2 poppler + lfsmake2 poppler-data lfsmake2 cups-filters lfsmake2 epson-inkjet-printer-escpr lfsmake2 foomatic lfsmake2 hplip lfsmake2 cifs-utils lfsmake2 krb5 + lfsmake2 rpcsvc-proto lfsmake2 samba + lfsmake2 netatalk lfsmake2 sudo lfsmake2 mc lfsmake2 wget @@ -1410,7 +1415,6 @@ buildipfire() { lfsmake2 chkconfig lfsmake2 postfix lfsmake2 fetchmail - lfsmake2 cyrus-imapd lfsmake2 clamav lfsmake2 perl-NetAddr-IP lfsmake2 spamassassin @@ -1434,9 +1438,9 @@ buildipfire() { lfsmake2 libmpeg2 lfsmake2 gnump3d lfsmake2 rsync - lfsmake2 libtirpc lfsmake2 rpcbind lfsmake2 keyutils + lfsmake2 libnfsidmap lfsmake2 nfs lfsmake2 gnu-netcat lfsmake2 ncat @@ -1501,7 +1505,6 @@ buildipfire() { lfsmake2 syslinux lfsmake2 tftpd lfsmake2 cpufrequtils - lfsmake2 bluetooth lfsmake2 gutenprint lfsmake2 apcupsd lfsmake2 iperf @@ -1518,6 +1521,7 @@ buildipfire() { lfsmake2 perl-DBD-SQLite lfsmake2 perl-File-ReadBackwards lfsmake2 openvmtools + lfsmake2 libmicrohttpd lfsmake2 motion lfsmake2 joe lfsmake2 monit @@ -1618,6 +1622,7 @@ buildipfire() { lfsmake2 libpciaccess lfsmake2 libyajl lfsmake2 libvirt + lfsmake2 libtalloc lfsmake2 freeradius lfsmake2 perl-common-sense lfsmake2 perl-inotify2 @@ -1630,16 +1635,19 @@ buildipfire() { lfsmake2 dehydrated lfsmake2 shairport-sync lfsmake2 borgbackup + lfsmake2 lmdb lfsmake2 knot lfsmake2 spectre-meltdown-checker lfsmake2 zabbix_agentd lfsmake2 flashrom lfsmake2 firmware-update lfsmake2 tshark - lfsmake2 geoip-generator lfsmake2 speedtest-cli lfsmake2 rfkill lfsmake2 amazon-ssm-agent + lfsmake2 libloc + lfsmake2 ncdu + lfsmake2 lshw } buildinstaller() { @@ -1692,15 +1700,12 @@ buildpackages() { ipfirepackages - lfsmake2 xen-image - mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1 - cd $BASEDIR # remove not useable iso on armv5tel (needed to build flash images) [ "${BUILD_ARCH}" = "armv5tel" ] && rm -rf *.iso - for i in `ls *.bz2 *.img.xz *.iso`; do + for i in $(ls *.bz2 *.img.xz *.iso 2>/dev/null); do md5sum $i > $i.md5 done cd $PWD @@ -1986,8 +1991,13 @@ lang) update-contributors) update_contributors ;; +find-dependencies) + shift + exec "${BASEDIR}/tools/find-dependencies" "${BASEDIR}/build" "$@" + ;; *) - echo "Usage: $0 {build|changelog|clean|gettoolchain|downloadsrc|shell|sync|toolchain|update-contributors}" + echo "Usage: $0 {build|changelog|clean|gettoolchain|downloadsrc|shell|sync|toolchain|update-contributors|find-dependencies}" cat doc/make.sh-usage ;; esac +