From: nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 23 Jan 2011 21:03:29 +0000 (+0000)
Subject: backport files/ symlink overwrite fix from r25078
X-Git-Url: http://git.ozo.com/?p=openwrt-10.03%2F.git;a=commitdiff_plain;h=a6b6acacda2dba8bc0926130b68ab42ecff1654e;ds=sidebyside

backport files/ symlink overwrite fix from r25078

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

diff --git a/package/Makefile b/package/Makefile
index 786edd49f..8e8c6c9a6 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -64,6 +64,14 @@ endif
 $(curdir)/rootfs-prepare: $(TMP_DIR)/.build
 	@-$(MAKE) package/preconfig
 	@if [ -d $(TOPDIR)/files ]; then \
+		( cd $(TOPDIR)/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) $(TOPDIR)/files/. $(TARGET_DIR); \
 	fi
 	@mkdir -p $(TARGET_DIR)/etc/rc.d