From: Felix Fietkau <nbd@openwrt.org>
Date: Sun, 23 Jan 2011 20:59:13 +0000 (+0000)
Subject: allow files/ to overwrite existing symlinks (fixes #3508)
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=d74ea1a133c9cf61d4173538c870ecafa826d852

allow files/ to overwrite existing symlinks (fixes #3508)

SVN-Revision: 25078
---

diff --git a/package/Makefile b/package/Makefile
index 786edd49f0..8e8c6c9a63 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