From ce9264a1c1ce3d6812b59204a06041a69bd24e95 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 10 Dec 2017 07:59:43 +0100 Subject: [PATCH] strip: use toolchain binary inside of chroot to strip Signed-off-by: Arne Fitzenreiter --- lfs/strip | 3 ++- make.sh | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/lfs/strip b/lfs/strip index 084082e7b1..b22cfb9a35 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 # # # # 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 bb80f3c052..7e2aec2573 100755 --- a/make.sh +++ b/make.sh @@ -627,7 +627,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 +1526,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() { -- 2.39.2