X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=f96b74b10e78ebfc439d4813693435c39d62c0f8;hp=9893fbb20e5a0099510445c8a0094f65e5019e56;hb=cae1f4a7a82f47703afb0cc25ff71f7585b28c2b;hpb=27267889aa791b5c4683f62fe823ab96fb42fe8a diff --git a/make.sh b/make.sh index 9893fbb20e..f96b74b10e 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-2018 IPFire Team . # +# Copyright (C) 2007-2019 IPFire Team . # # # ############################################################################ # NAME="IPFire" # Software name SNAME="ipfire" # Short name -VERSION="2.19" # Version number -CORE="121" # Core Level (Filename) -PAKFIRE_CORE="120" # Core Level (PAKFIRE) +VERSION="2.21" # Version number +CORE="128" # Core Level (Filename) +PAKFIRE_CORE="127" # 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=20180213 +TOOLCHAINVER=20181030 ############################################################################### # @@ -225,11 +225,38 @@ configure_build() { MAKETUNING="-j${parallelism}" fi + + # Compression parameters + # We use mode 8 for reasonable memory usage when decompressing + # but with overall good compression + XZ_OPT="-8" + + # We try to use as many cores as possible + XZ_OPT="${XZ_OPT} -T0" + + # We need to limit memory because XZ uses too much when running + # in parallel and it isn't very smart in limiting itself. + # We allow XZ to use up to 70% of all system memory. + local xz_memory=$(( HOST_MEM * 7 / 10 )) + + # XZ memory cannot be larger than 2GB on 32 bit systems + case "${build_arch}" in + i*86|armv*) + if [ ${xz_memory} -gt 2048 ]; then + xz_memory=2048 + fi + ;; + esac + + XZ_OPT="${XZ_OPT} --memory=${xz_memory}MiB" } configure_build_guess() { case "${HOST_ARCH}" in - x86_64|i686|i586) + x86_64) + echo "x86_64" + ;; + i?86) echo "i586" ;; @@ -847,6 +874,28 @@ update_language_list() { done | sort -u > "${path}/LINGUAS" } +contributors() { + local commits name + + git shortlog --summary --numbered | while read -r commits name; do + echo "${name}" + done | grep -vE -e "^(alpha197|morlix|root|ummeegge)$" -e "via Development$" -e "@" -e "#$" +} + +update_contributors() { + echo -n "Updating list of contributors" + + local contributors="$(contributors | paste -sd , - | sed -e "s/,/&\\\\n/g")" + + # Edit contributors into credits.cgi + awk -i inplace \ + "//{ p=1; print; printf \"${contributors}\n\"}//{ p=0 } !p" \ + "${BASEDIR}/html/cgi-bin/credits.cgi" + + print_status DONE + return 0 +} + # Load configuration file if [ -f .config ]; then . .config @@ -861,21 +910,6 @@ 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 @@ -1008,6 +1042,7 @@ buildbase() { lfsmake2 readline lfsmake2 readline-compat lfsmake2 bzip2 + lfsmake2 xz lfsmake2 pcre lfsmake2 pcre-compat lfsmake2 bash @@ -1042,8 +1077,6 @@ buildbase() { lfsmake2 util-linux lfsmake2 udev lfsmake2 vim - lfsmake2 xz - lfsmake2 paxctl } buildipfire() { @@ -1052,6 +1085,9 @@ buildipfire() { lfsmake2 configroot lfsmake2 initscripts lfsmake2 backup + lfsmake2 openssl + [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2' + lfsmake2 popt lfsmake2 libusb lfsmake2 libusb-compat lfsmake2 libpcap @@ -1069,10 +1105,13 @@ buildipfire() { lfsmake2 cpio lfsmake2 mdadm lfsmake2 dracut + lfsmake2 libaio lfsmake2 lvm2 lfsmake2 multipath-tools lfsmake2 freetype lfsmake2 grub + lfsmake2 efivar + lfsmake2 efibootmgr lfsmake2 libmnl lfsmake2 libnfnetlink lfsmake2 libnetfilter_queue @@ -1084,7 +1123,7 @@ buildipfire() { lfsmake2 elfutils case "${BUILD_ARCH}" in - x86_64) + x86_64|aarch64) lfsmake2 linux KCFG="" # lfsmake2 backports KCFG="" # lfsmake2 e1000e KCFG="" @@ -1133,14 +1172,14 @@ buildipfire() { lfsmake2 linux-initrd KCFG="-multi" ;; esac + lfsmake2 intel-microcode 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 json-c + lfsmake2 libconfig lfsmake2 libevent lfsmake2 libevent2 lfsmake2 expat @@ -1175,7 +1214,6 @@ buildipfire() { lfsmake2 libtiff lfsmake2 libart lfsmake2 gd - lfsmake2 popt lfsmake2 slang lfsmake2 newt lfsmake2 libsmooth @@ -1196,7 +1234,9 @@ buildipfire() { lfsmake2 bootstrap lfsmake2 arping lfsmake2 beep - lfsmake2 dvdrtools + lfsmake2 libarchive + lfsmake2 cmake + lfsmake2 cdrkit lfsmake2 dosfstools lfsmake2 reiserfsprogs lfsmake2 xfsprogs @@ -1297,6 +1337,7 @@ buildipfire() { lfsmake2 dbus lfsmake2 intltool lfsmake2 libdaemon + lfsmake2 avahi lfsmake2 cups lfsmake2 lcms2 lfsmake2 ghostscript @@ -1313,7 +1354,6 @@ buildipfire() { lfsmake2 mc lfsmake2 wget lfsmake2 bridge-utils -# lfsmake2 screen lfsmake2 smartmontools lfsmake2 htop lfsmake2 chkconfig @@ -1335,15 +1375,15 @@ buildipfire() { lfsmake2 flac lfsmake2 lame lfsmake2 sox + lfsmake2 soxr lfsmake2 libshout lfsmake2 xvid lfsmake2 libmpeg2 - lfsmake2 libarchive - lfsmake2 cmake lfsmake2 gnump3d lfsmake2 rsync lfsmake2 libtirpc lfsmake2 rpcbind + lfsmake2 keyutils lfsmake2 nfs lfsmake2 gnu-netcat lfsmake2 ncat @@ -1376,9 +1416,11 @@ buildipfire() { lfsmake2 nagios_nrpe lfsmake2 nagios-plugins lfsmake2 icinga + lfsmake2 observium-agent lfsmake2 ebtables lfsmake2 directfb lfsmake2 faad2 + lfsmake2 alac lfsmake2 ffmpeg lfsmake2 vdr lfsmake2 vdr_streamdev @@ -1391,6 +1433,7 @@ buildipfire() { lfsmake2 mpd lfsmake2 libmpdclient lfsmake2 mpc + lfsmake2 perl-Net-CIDR-Lite lfsmake2 perl-Net-SMTP-SSL lfsmake2 perl-MIME-Base64 lfsmake2 perl-Authen-SASL @@ -1457,6 +1500,21 @@ buildipfire() { lfsmake2 python-progressbar lfsmake2 python-xattr lfsmake2 ddns + lfsmake2 python3-setuptools + lfsmake2 python3-setuptools-scm + lfsmake2 python3-six + lfsmake2 python3-dateutil + lfsmake2 python3-jmespath + lfsmake2 python3-colorama + lfsmake2 python3-docutils + lfsmake2 python3-yaml + lfsmake2 python3-s3transfer + lfsmake2 python3-rsa + lfsmake2 python3-pyasn1 + lfsmake2 python3-botocore + lfsmake2 python3-llfuse + lfsmake2 python3-msgpack + lfsmake2 aws-cli lfsmake2 transmission lfsmake2 dpfhack lfsmake2 lcd4linux @@ -1510,6 +1568,7 @@ buildipfire() { lfsmake2 lua lfsmake2 dnsdist lfsmake2 bird + lfsmake2 frr lfsmake2 dmidecode lfsmake2 mcelog lfsmake2 rtpproxy @@ -1525,6 +1584,10 @@ buildipfire() { lfsmake2 iftop lfsmake2 mdns-repeater lfsmake2 i2c-tools + lfsmake2 nss-myhostname + lfsmake2 dehydrated + lfsmake2 shairport-sync + lfsmake2 borgbackup } buildinstaller() { @@ -1573,7 +1636,7 @@ buildpackages() { lfsmake2 flash-images fi - mv $LFS/install/images/{*.iso,*.tgz,*.img.gz,*.bz2} $BASEDIR >> $LOGFILE 2>&1 + mv $LFS/install/images/{*.iso,*.img.xz,*.bz2} $BASEDIR >> $LOGFILE 2>&1 ipfirepackages @@ -1585,7 +1648,7 @@ buildpackages() { # remove not useable iso on armv5tel (needed to build flash images) [ "${BUILD_ARCH}" = "armv5tel" ] && rm -rf *.iso - for i in `ls *.bz2 *.img.gz *.iso`; do + for i in `ls *.bz2 *.img.xz *.iso`; do md5sum $i > $i.md5 done cd $PWD @@ -1713,6 +1776,20 @@ clean) rm -f $BASEDIR/ipfire-* print_status DONE ;; +docker) + # Build the docker image if it does not exist, yet + if ! docker images -a | grep -q ^ipfire-builder; then + if docker build -t ipfire-builder ${BASEDIR}/tools/docker; then + print_status DONE + else + print_status FAIL + exit 1 + fi + fi + + # Run the container and enter a shell + docker run -it --privileged -v "${BASEDIR}:/build" -w "/build" ipfire-builder bash -l + ;; downloadsrc) if [ ! -d $BASEDIR/cache ]; then mkdir $BASEDIR/cache @@ -1776,8 +1853,8 @@ 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="$(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 + cd $BASEDIR && tar -cf- --exclude='log/_build.*.log' build/${TOOLS_DIR} build/bin/sh log | xz ${XZ_OPT} \ + > cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.tar.xz md5sum cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.tar.xz \ > cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.md5 stdumount @@ -1854,8 +1931,11 @@ lang) update_language_list ${BASEDIR}/src/setup/po print_status DONE ;; +update-contributors) + update_contributors + ;; *) - echo "Usage: $0 {build|changelog|clean|gettoolchain|downloadsrc|shell|sync|toolchain}" + echo "Usage: $0 {build|changelog|clean|gettoolchain|downloadsrc|shell|sync|toolchain|update-contributors}" cat doc/make.sh-usage ;; esac