From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 22 Nov 2012 19:49:40 +0000 (+0000)
Subject: AA: imagebuilder: merge r34301
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=7b75de20b9726512ea12a003db826374d08f36f1;p=12.09%2Fopenwrt.git

AA: imagebuilder: merge r34301

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@34302 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile
index b0d0698..4d0f1fe 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