From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 2 Dec 2012 12:20:43 +0000 (+0000)
Subject: imagebuilder: use file_copy to deploy files/ in the image generation phase
X-Git-Tag: reboot~12141
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=476ea2bcb4f9387f0b420ec1d81063d0b5996b0e;p=oweals%2Fopenwrt.git

imagebuilder: use file_copy to deploy files/ in the image generation phase

SVN-Revision: 34439
---

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