From d74ea1a133c9cf61d4173538c870ecafa826d852 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Sun, 23 Jan 2011 20:59:13 +0000 Subject: [PATCH 1/1] allow files/ to overwrite existing symlinks (fixes #3508) SVN-Revision: 25078 --- package/Makefile | 8 ++++++++ 1 file changed, 8 insertions(+) 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 -- 2.30.2