Browse Source

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

SVN-Revision: 34439
Jo-Philipp Wich 13 years ago
parent
commit
476ea2bcb4
1 changed files with 1 additions and 9 deletions
  1. 1 9
      target/imagebuilder/files/Makefile

+ 1 - 9
target/imagebuilder/files/Makefile

@@ -134,15 +134,7 @@ package_install: FORCE
 copy_files: FORCE
 copy_files: FORCE
 	@echo
 	@echo
 	@echo Copying extra files
 	@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
 package_postinst: FORCE
 	@echo
 	@echo