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

[openwrt/openwrt.git] / target / imagebuilder / files / Makefile

diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile
index 803252b4b60da6b8e404a02b83b5607a916ccbda..ecaf5ccda32f2b8cc5fa4ed6142be7813927f548 100644 (file)
--- a/target/imagebuilder/files/Makefile
+++ b/target/imagebuilder/files/Makefile
@@ -126,6 +126,7 @@ package_index: FORCE
 package_install: FORCE
        @echo
        @echo Installing packages...
+       $(OPKG) install $(PACKAGE_DIR)/libc_*.ipk
        $(OPKG) install $(PACKAGE_DIR)/kernel_*.ipk
        $(OPKG) install $(BUILD_PACKAGES)
        rm -f $(TARGET_DIR)/usr/lib/opkg/lists/*
@@ -133,7 +134,7 @@ package_install: FORCE
 copy_files: FORCE
        @echo
        @echo Copying extra files
-       $(CP) $(USER_FILES)/* $(TARGET_DIR)/
+       @$(call file_copy,$(USER_FILES)/*,$(TARGET_DIR)/)
 
 package_postinst: FORCE
        @echo