aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2012-11-22 19:46:54 +0000
committerJo-Philipp Wich <jow@openwrt.org>2012-11-22 19:46:54 +0000
commitfffc430bd89ba061daba8271b659e2e7d4812864 (patch)
treeb340b9484e185f6376b34a9d70135ad70c13a1a8 /target
parentc596ba2220028d9a187fc9d22e4380aea75e1d68 (diff)
downloadupstream-fffc430bd89ba061daba8271b659e2e7d4812864.tar.gz
upstream-fffc430bd89ba061daba8271b659e2e7d4812864.tar.bz2
upstream-fffc430bd89ba061daba8271b659e2e7d4812864.zip
imagebuilder: merge r25078 to align files/ handling with current buildroot
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34301 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/imagebuilder/files/Makefile8
1 files changed, 8 insertions, 0 deletions
diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile
index b0d0698acd..4d0f1fe115 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