This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 979f8700b26fc442f021f8a6fe891e05b76aabe0 (commit) via ce9264a1c1ce3d6812b59204a06041a69bd24e95 (commit) from 51d1e9ce4d7f2305bc7cc868a48810a6ef268f4d (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 979f8700b26fc442f021f8a6fe891e05b76aabe0 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Dec 10 08:18:06 2017 +0100
make.sh limit build to 23 parallel threads.
perl will not work with more parallel build processes.
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit ce9264a1c1ce3d6812b59204a06041a69bd24e95 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sun Dec 10 07:59:43 2017 +0100
strip: use toolchain binary inside of chroot to strip
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes: lfs/strip | 3 ++- make.sh | 11 +++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-)
Difference in files: diff --git a/lfs/strip b/lfs/strip index 084082e7b..b22cfb9a3 100644 --- a/lfs/strip +++ b/lfs/strip @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2017 IPFire Team info@ipfire.org # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -36,6 +36,7 @@ ifeq "$(TOOLCHAIN)" "1" else SHELL = $(TOOLS_DIR)/bin/bash STRIP = $(TOOLS_DIR)/bin/strip + ROOT = / endif
############################################################################### diff --git a/make.sh b/make.sh index bb80f3c05..16d6eddff 100755 --- a/make.sh +++ b/make.sh @@ -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 } @@ -627,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" \ @@ -1526,7 +1532,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() {
hooks/post-receive -- IPFire 2.x development tree