summaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-12-02 12:20:43 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2012-12-02 12:20:43 +0000
commit9af59dcfddea2ee66c71be85a8f4d82c6b0fe3bd (patch)
tree4163325b843d7a74cdafa9dc66fe3f78e7b888cd /target
parent651ee3b9d425d70e2e9ec9dad65691fed6aeaa6e (diff)
imagebuilder: use file_copy to deploy files/ in the image generation phase
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34439 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target')
-rw-r--r--target/imagebuilder/files/Makefile10
1 files changed, 1 insertions, 9 deletions
diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile
index 4d0f1fe11..ecaf5ccda 100644
--- a/target/imagebuilder/files/Makefile
+++ b/target/imagebuilder/files/Makefile
@@ -134,15 +134,7 @@ 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)/
+ @$(call file_copy,$(USER_FILES)/*,$(TARGET_DIR)/)
package_postinst: FORCE
@echo