X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=c05e4b59082c1253ef4494e1408d414182c78766;hp=b9558bc0427864ab3177c1da811a8767ecd3d8f9;hb=9f52e35066b3fa8603e85784b7ede0532afc66e6;hpb=02776a0dc27051337ecaf0212a740c642b337378 diff --git a/make.sh b/make.sh index b9558bc042..c05e4b5908 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.21" # Version number -CORE="125" # Core Level (Filename) -PAKFIRE_CORE="124" # Core Level (PAKFIRE) +VERSION="2.23" # Version number +CORE="130" # Core Level (Filename) +PAKFIRE_CORE="129" # 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=20181024 +TOOLCHAINVER=20181030 ############################################################################### # @@ -201,31 +201,22 @@ configure_build() { CXXFLAGS="${CFLAGS}" # Determine parallelism - if [ -z "${MAKETUNING}" ]; then - # We assume that each process consumes about - # 192MB of memory. Therefore we find out how - # many processes fit into memory. - local mem_max=$(( ${HOST_MEM} / 192 )) - - local processors="$(system_processors)" - local cpu_max=$(( ${processors} + 1 )) - - local parallelism - if [ ${mem_max} -lt ${cpu_max} ]; then - parallelism=${mem_max} - else - parallelism=${cpu_max} - fi - - # limit to -j23 because perl will not build - # more - if [ ${parallelism} -gt 23 ]; then - parallelism=23 - fi - - MAKETUNING="-j${parallelism}" + # We assume that each process consumes about + # 128MB of memory. Therefore we find out how + # many processes fit into memory. + local mem_max=$(( ${SYSTEM_MEMORY} / 128 )) + local cpu_max=$(( ${SYSTEM_PROCESSORS} + 1 )) + + local parallelism + if [ ${mem_max} -lt ${cpu_max} ]; then + parallelism=${mem_max} + else + parallelism=${cpu_max} fi + # Use this as default PARALLELISM + DEFAULT_PARALLELISM="${parallelism}" + # Compression parameters # We use mode 8 for reasonable memory usage when decompressing # but with overall good compression @@ -237,7 +228,7 @@ configure_build() { # 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 )) + local xz_memory=$(( SYSTEM_MEMORY * 7 / 10 )) # XZ memory cannot be larger than 2GB on 32 bit systems case "${build_arch}" in @@ -253,7 +244,10 @@ configure_build() { configure_build_guess() { case "${HOST_ARCH}" in - x86_64|i686|i586) + x86_64) + echo "x86_64" + ;; + i?86) echo "i586" ;; @@ -466,7 +460,7 @@ prepareenv() { # Setup environment set +h LC_ALL=POSIX - export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING + export LFS LC_ALL CFLAGS CXXFLAGS DEFAULT_PARALLELISM unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD # Make some extra directories @@ -551,6 +545,9 @@ enterchroot() { CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \ KVER="${KVER}" \ XZ_OPT="${XZ_OPT}" \ + DEFAULT_PARALLELISM="${DEFAULT_PARALLELISM}" \ + SYSTEM_PROCESSORS="${SYSTEM_PROCESSORS}" \ + SYSTEM_MEMORY="${SYSTEM_MEMORY}" \ $(fake_environ) \ $(qemu_environ) \ "$@" @@ -630,7 +627,9 @@ lfsmake1() { CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \ CFLAGS="${CFLAGS}" \ CXXFLAGS="${CXXFLAGS}" \ - MAKETUNING="${MAKETUNING}" \ + DEFAULT_PARALLELISM="${DEFAULT_PARALLELISM}" \ + SYSTEM_PROCESSORS="${SYSTEM_PROCESSORS}" \ + SYSTEM_MEMORY="${SYSTEM_MEMORY}" \ make -f $* \ TOOLCHAIN=1 \ TOOLS_DIR="${TOOLS_DIR}" \ @@ -659,7 +658,6 @@ lfsmake2() { enterchroot \ ${EXTRA_PATH}bash -x -c "cd /usr/src/lfs && \ - MAKETUNING=${MAKETUNING} \ make -f $* \ LFS_BASEDIR=/usr/src install" \ >> ${LOGFILE} 2>&1 & @@ -904,8 +902,9 @@ if [ -n "${TARGET_ARCH}" ]; then unset TARGET_ARCH fi -# Get the amount of memory in this build system -HOST_MEM=$(system_memory) +# Get some information about the host system +SYSTEM_PROCESSORS="$(system_processors)" +SYSTEM_MEMORY="$(system_memory)" if [ -n "${BUILD_ARCH}" ]; then configure_build "${BUILD_ARCH}" @@ -1039,6 +1038,7 @@ buildbase() { lfsmake2 readline lfsmake2 readline-compat lfsmake2 bzip2 + lfsmake2 xz lfsmake2 pcre lfsmake2 pcre-compat lfsmake2 bash @@ -1073,8 +1073,6 @@ buildbase() { lfsmake2 util-linux lfsmake2 udev lfsmake2 vim - lfsmake2 xz - lfsmake2 paxctl } buildipfire() { @@ -1085,8 +1083,8 @@ buildipfire() { lfsmake2 backup lfsmake2 openssl [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2' - lfsmake2 openssl-compat lfsmake2 popt + lfsmake2 libedit lfsmake2 libusb lfsmake2 libusb-compat lfsmake2 libpcap @@ -1099,6 +1097,7 @@ buildipfire() { lfsmake2 xr819-firmware lfsmake2 zd1211-firmware lfsmake2 rpi-firmware + lfsmake2 intel-microcode lfsmake2 bc lfsmake2 u-boot MKIMAGE=1 lfsmake2 cpio @@ -1171,12 +1170,13 @@ buildipfire() { lfsmake2 linux-initrd KCFG="-multi" ;; esac - lfsmake2 intel-microcode lfsmake2 xtables-addons USPACE="1" lfsmake2 libgpg-error lfsmake2 libgcrypt lfsmake2 libassuan lfsmake2 nettle + lfsmake2 json-c + lfsmake2 libconfig lfsmake2 libevent lfsmake2 libevent2 lfsmake2 expat @@ -1217,6 +1217,7 @@ buildipfire() { lfsmake2 attr lfsmake2 acl lfsmake2 libcap + lfsmake2 libcap-ng lfsmake2 pciutils lfsmake2 usbutils lfsmake2 libxml2 @@ -1315,9 +1316,11 @@ buildipfire() { lfsmake2 setserial lfsmake2 setup lfsmake2 libdnet - lfsmake2 daq - lfsmake2 snort + lfsmake2 yaml + lfsmake2 libhtp + lfsmake2 suricata lfsmake2 oinkmaster + lfsmake2 ids-ruleset-sources lfsmake2 squid lfsmake2 squidguard lfsmake2 calamaris @@ -1372,6 +1375,7 @@ buildipfire() { lfsmake2 flac lfsmake2 lame lfsmake2 sox + lfsmake2 soxr lfsmake2 libshout lfsmake2 xvid lfsmake2 libmpeg2 @@ -1412,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 @@ -1427,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 @@ -1493,6 +1500,8 @@ 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 @@ -1503,6 +1512,8 @@ buildipfire() { lfsmake2 python3-rsa lfsmake2 python3-pyasn1 lfsmake2 python3-botocore + lfsmake2 python3-llfuse + lfsmake2 python3-msgpack lfsmake2 aws-cli lfsmake2 transmission lfsmake2 dpfhack @@ -1557,6 +1568,7 @@ buildipfire() { lfsmake2 lua lfsmake2 dnsdist lfsmake2 bird + lfsmake2 frr lfsmake2 dmidecode lfsmake2 mcelog lfsmake2 rtpproxy @@ -1573,6 +1585,12 @@ buildipfire() { lfsmake2 mdns-repeater lfsmake2 i2c-tools lfsmake2 nss-myhostname + lfsmake2 dehydrated + lfsmake2 shairport-sync + lfsmake2 borgbackup + lfsmake2 knot + lfsmake2 spectre-meltdown-checker + lfsmake2 zabbix_agentd } buildinstaller() { @@ -1761,6 +1779,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