From: Jo-Philipp Wich <jow@openwrt.org>
Date: Thu, 22 Nov 2012 19:46:54 +0000 (+0000)
Subject: imagebuilder: merge r25078 to align files/ handling with current buildroot
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=b73f22de1e778308701ca8951cd402d01137d3c6;hp=a21fbec0069e982bb69e88dc787f77f94887f734;p=openwrt%2Fstaging%2Fdedeckeh.git

imagebuilder: merge r25078 to align files/ handling with current buildroot

SVN-Revision: 34301
---

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