strip: Do not try to strip QEMU

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/lfs/strip b/lfs/strip
index c577c954be2456ed6c0c479c71fb3187ba6533a9..64f5c702f638a02cc67b73ab372ef84b903f2d45 100644 (file)
--- a/lfs/strip
+++ b/lfs/strip
@@ -58,6 +58,7 @@ else
        # /usr/sbin/vdr.
        $(DIR_SRC)/src/stripper / \
                --exclude=$(TOOLS_DIR) \
+               --exclude=$(QEMU_TARGET_HELPER) \
                --exclude=/tmp \
                --exclude=/usr/src \
                --exclude=/usr/lib/vdr \

diff --git a/make.sh b/make.sh
index 1fb14c9eaa78343a8e66dac74d2edfd4000dc773..b6d8153d2923c79c89eca7db75ee9d20a37a5ae4 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -781,7 +781,7 @@ fake_environ() {
 }
 
 qemu_environ() {
-       local env
+       local env="QEMU_TARGET_HELPER=${QEMU_TARGET_HELPER}"
 
        # Don't add anything if qemu is not used.
        if ! qemu_is_required; then

diff --git a/src/stripper b/src/stripper
index 498a8a30ecdba103f18e7a2b36f95373125947e0..fadbc514b86eabe78e8d7564120f8a702238f52e 100755 (executable)
--- a/src/stripper
+++ b/src/stripper
@@ -11,7 +11,9 @@ while [ $# -gt 0 ]; do
                        strip="${1#*=}"
                        ;;
                --exclude=*)
-                       excludes+=( "!" "-path" "${1#*=}/*" )
+                       if [ -n "${1#*=}" ]; then
+                               excludes+=( "!" "-path" "${1#*=}" "!" "-path" "${1#*=}/*" )
+                       fi
                        ;;
                --ignore-errors)
                        break_on_error="0"