imagebuilder: fix typo that copied grub to the wrong folder

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

diff --git a/target/imagebuilder/files/Makefile b/target/imagebuilder/files/Makefile
index e8d282a..ecaf5cc 100644 (file)
--- a/target/imagebuilder/files/Makefile
+++ b/target/imagebuilder/files/Makefile
@@ -10,7 +10,7 @@ TOPDIR:=${CURDIR}
 LC_ALL:=C
 LANG:=C
 export TOPDIR LC_ALL LANG
-export KBUILD_VERBOSE=99
+export OPENWRT_VERBOSE=s
 all: help
 
 include $(TOPDIR)/include/host.mk
@@ -38,7 +38,7 @@ Building images:
        By default 'make image' will create an image with the default
        target profile and package set. You can use the following parameters
        to change that:
-       
+
        make image PROFILE="<profilename>" # override the default target profile
        make image PACKAGES="<pkg1> [<pkg2> [<pkg3> ...]]" # include extra packages
        make image FILES="<path>" # include extra files from <path>
@@ -113,7 +113,7 @@ ifneq ($(USER_FILES),)
 endif
        $(MAKE) package_postinst
        $(MAKE) build_image
-       
+
 package_index: FORCE
        @echo
        @echo Building package index...
@@ -126,13 +126,15 @@ 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/*
 
 copy_files: FORCE
        @echo
        @echo Copying extra files
-       $(CP) $(USER_FILES)/* $(TARGET_DIR)/
+       @$(call file_copy,$(USER_FILES)/*,$(TARGET_DIR)/)
 
 package_postinst: FORCE
        @echo
@@ -152,8 +154,9 @@ package_postinst: FORCE
 build_image: FORCE
        @echo
        @echo Building images...
-       $(NO_TRACE_MAKE) -C target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1
-       
+       $(NO_TRACE_MAKE) -C target/linux/$(BOARD)/image install TARGET_BUILD=1 IB=1 \
+               $(if $(USER_PROFILE),PROFILE="$(USER_PROFILE)")
+
 clean:
        rm -rf $(TOPDIR)/tmp $(TOPDIR)/dl $(TARGET_DIR) $(BIN_DIR)