aboutsummaryrefslogtreecommitdiffstats
path: root/target/imagebuilder/files
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
commitb73f22de1e778308701ca8951cd402d01137d3c6 (patch)
tree59b62d87180423c12c18cdf3be76f26e38ddd2c6 /target/imagebuilder/files
parenta21fbec0069e982bb69e88dc787f77f94887f734 (diff)
downloadupstream-b73f22de1e778308701ca8951cd402d01137d3c6.tar.gz
upstream-b73f22de1e778308701ca8951cd402d01137d3c6.tar.bz2
upstream-b73f22de1e778308701ca8951cd402d01137d3c6.zip
imagebuilder: merge r25078 to align files/ handling with current buildroot
SVN-Revision: 34301
Diffstat (limited to 'target/imagebuilder/files')
-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