strip: use toolchain binary inside of chroot to strip
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 10 Dec 2017 06:59:43 +0000 (07:59 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 10 Dec 2017 06:59:43 +0000 (07:59 +0100)
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
lfs/strip
make.sh

index 084082e..b22cfb9 100644 (file)
--- 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 bb80f3c..7e2aec2 100755 (executable)
--- 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() {