Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x

[people/mfischer/ipfire-2.x.git] / lfs / strip

diff --git a/lfs/strip b/lfs/strip
index 48e698a7cfecbd4c08210da59271a67248102644..c369ac3f18d1e5f391f400343daa3f014b9ce0ab 100644 (file)
--- a/lfs/strip
+++ b/lfs/strip
@@ -29,16 +29,6 @@ VER = ipfire
 THISAPP    = strip
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
-ifeq "$(TOOLCHAIN)" "1"
-       SHELL = /bin/bash
-       STRIP = /usr/bin/strip
-       ROOT = $(TOOLS_DIR)
-else
-       SHELL = $(TOOLS_DIR)/bin/bash
-       STRIP = $(TOOLS_DIR)/bin/strip
-       ROOT = /
-endif
-
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -49,25 +39,30 @@ check :
 
 download :
 
-md5 :
+b2 :
 
 ###############################################################################
 # Installation Details
 ###############################################################################
 
 $(TARGET) :
+ifeq "$(TOOLCHAIN)" "1"
+       # Strip everything in the toolchain
+       $(DIR_SRC)/src/stripper $(TOOLS_DIR) \
+               --strip="$(TOOLS_DIR)/$(CROSSTARGET)/bin/strip" \
+               --ignore-errors \
+               --exclude=$(TOOLS_DIR)/$(CROSSTARGET)
+else
        # Don't strip VDR binaries, because they use a weird plugin system
        # which does not work when unneeded symbols get stripped from
        # /usr/sbin/vdr.
-       STRIP=$(STRIP) $(SHELL) $(DIR_SRC)/src/stripper \
-               $(ROOT) \
+       $(DIR_SRC)/src/stripper / \
                --exclude=$(TOOLS_DIR) \
-               --exclude=/dev \
-               --exclude=/proc \
-               --exclude=/sys \
+               --exclude=$(QEMU_TARGET_HELPER) \
                --exclude=/tmp \
                --exclude=/usr/src \
                --exclude=/usr/lib/vdr \
                --exclude=/usr/sbin/vdr \
                --exclude=/var/tmp \
                --exclude=/usr/lib/go
+endif