diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2012-12-02 12:20:43 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2012-12-02 12:20:43 +0000 |
| commit | 476ea2bcb4f9387f0b420ec1d81063d0b5996b0e (patch) | |
| tree | af499e975fe5114162bb13b6172fe476db661c94 /target/imagebuilder | |
| parent | a99b0363d0e3974087695f47f3c60b8959ae815a (diff) | |
| download | upstream-476ea2bcb4f9387f0b420ec1d81063d0b5996b0e.tar.gz upstream-476ea2bcb4f9387f0b420ec1d81063d0b5996b0e.tar.bz2 upstream-476ea2bcb4f9387f0b420ec1d81063d0b5996b0e.zip | |
imagebuilder: use file_copy to deploy files/ in the image generation phase
SVN-Revision: 34439
Diffstat (limited to 'target/imagebuilder')
| -rw-r--r-- | target/imagebuilder/files/Makefile | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile index 4d0f1fe115..ecaf5ccda3 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 |