From b73f22de1e778308701ca8951cd402d01137d3c6 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Thu, 22 Nov 2012 19:46:54 +0000 Subject: [PATCH] imagebuilder: merge r25078 to align files/ handling with current buildroot SVN-Revision: 34301 --- target/imagebuilder/files/Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile index b0d0698acd..4d0f1fe115 100644 --- a/target/imagebuilder/files/Makefile +++ b/target/imagebuilder/files/Makefile @@ -134,6 +134,14 @@ package_install: FORCE copy_files: FORCE @echo @echo Copying extra files + @( cd $(USER_FILES); find -type f ) | \ + ( cd $(TARGET_DIR); while :; do \ + read FILE; \ + [ -z "$$FILE" ] && break; \ + [ -L "$$FILE" ] || continue; \ + echo "Removing symlink $(TARGET_DIR)/$$FILE"; \ + rm -f "$$FILE"; \ + done; ) $(CP) $(USER_FILES)/* $(TARGET_DIR)/ package_postinst: FORCE -- 2.25.1