From 9af59dcfddea2ee66c71be85a8f4d82c6b0fe3bd Mon Sep 17 00:00:00 2001 From: jow Date: Sun, 2 Dec 2012 12:20:43 +0000 Subject: 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 --- target/imagebuilder/files/Makefile | 10 +--------- 1 file changed, 1 insertion(+), 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 -- cgit v1.2.3