diff options
| author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-01-23 20:59:13 +0000 |
|---|---|---|
| committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2011-01-23 20:59:13 +0000 |
| commit | 880fc7385ae8b714f00d63432b1a52c29084a30c (patch) | |
| tree | 3699d0cc73e4a503ac3a4f429128f21f68d6b499 | |
| parent | 4741579f805d42d80989f7585565db2698dbd677 (diff) | |
allow files/ to overwrite existing symlinks (fixes #3508)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25078 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
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 |