Commit 26f215d1 authored by Andrew Parlane's avatar Andrew Parlane Committed by Thomas Petazzoni
Browse files

target-finalize: Use NULL deliminators when stripping the target directory. 



Special characters in files or directories in the rootfs can cause
problems when stripping files.  For example "target/some song.mp3"
gets treated as two entries. "target/some" and "song.mp3" are both
passed to $(STRIPCMD). This then errors saying files don't exist.

Additionally a ' and possibly other special characters in a file path
causes xargs to give the error: "xargs: unmatched single quote; by
default quotes are special to xargs unless you use the -0
option". This also has the effect of removing this entry and further
entries from the list of files to strip.  This can be demonstrated by
having a test directory with the files: "cat" "rabbit's"
"elephant". then running the command: "find -name "*" -print | xargs"

To fix this we pass -print0 to find which seperates entries with a
NULL character, and we pass -0 to xargs to tell it to only use NULL
characters as the deliminator.

Signed-off-by: default avatarAndrew Parlane <andrewp@carallon.com>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 3503386a

Makefile

+2 −2
Original line number Diff line number Diff line
@@ -500,7 +500,7 @@ STRIP_FIND_CMD += -type f \( -perm /111 -o -name '*.so*' \) 
#   applications and libraries. Normally kernel modules are already excluded

#   by the executable permission check above, so the explicit exclusion is only

#   done for kernel modules with incorrect permissions.

STRIP_FIND_CMD += -not \( $(call findfileclauses,libpthread*.so* *.ko $(call qstrip,$(BR2_STRIP_EXCLUDE_FILES))) \) -print

STRIP_FIND_CMD += -not \( $(call findfileclauses,libpthread*.so* *.ko $(call qstrip,$(BR2_STRIP_EXCLUDE_FILES))) \) -print0



ifeq ($(BR2_ECLIPSE_REGISTER),y)

define TOOLCHAIN_ECLIPSE_REGISTER
@@ -579,7 +579,7 @@ endif 
	rm -rf $(TARGET_DIR)/usr/doc $(TARGET_DIR)/usr/share/doc

	rm -rf $(TARGET_DIR)/usr/share/gtk-doc

	-rmdir $(TARGET_DIR)/usr/share 2>/dev/null

	$(STRIP_FIND_CMD) | xargs $(STRIPCMD) 2>/dev/null || true

	$(STRIP_FIND_CMD) | xargs -0 $(STRIPCMD) 2>/dev/null || true

	if test -d $(TARGET_DIR)/lib/modules; then \

		find $(TARGET_DIR)/lib/modules -type f -name '*.ko' | \

		xargs -r $(KSTRIPCMD); fi