fix ImageBuilder (closes: #3863)

[openwrt/staging/chunkeey.git] / target / imagebuilder / Makefile

diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index f30eb83a7b3f7d1dae7e09ec4f643d44c7d2318b..12e391ef90a885b9d4a662cae46548fdb24e318a 100644 (file)
--- a/target/imagebuilder/Makefile
+++ b/target/imagebuilder/Makefile
@@ -10,10 +10,12 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/host.mk
 
+override MAKEFLAGS=
+
 PKG_OS:=$(shell uname -s)
 PKG_CPU:=$(shell uname -m | sed "s/ //g")
 
-IB_NAME:=OpenWrt-ImageBuilder-$(BOARD)-$(KERNEL)-for-$(PKG_OS)-$(PKG_CPU)
+IB_NAME:=OpenWrt-ImageBuilder-$(BOARD)-for-$(PKG_OS)-$(PKG_CPU)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(IB_NAME)
 IB_KDIR:=$(patsubst $(TOPDIR)/%,$(PKG_BUILD_DIR)/%,$(KERNEL_BUILD_DIR))
 
@@ -23,14 +25,15 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2: clean
        rm -rf $(PKG_BUILD_DIR)
        mkdir -p $(IB_KDIR) $(PKG_BUILD_DIR)/staging_dir/host $(PKG_BUILD_DIR)/target
        $(CP) \
-               $(INCLUDE_DIR) $(SCRIPT_DIR) $(PACKAGE_DIR) \
+               $(INCLUDE_DIR) $(SCRIPT_DIR) \
                $(TOPDIR)/rules.mk $(TOPDIR)/.config \
                ./files/Makefile \
                $(TMP_DIR)/.targetinfo \
                $(TMP_DIR)/.packageinfo \
                $(PKG_BUILD_DIR)/
-       $(INSTALL_BIN) $(TOOLCHAIN_DIR)/bin $(PKG_BUILD_DIR)/staging_dir/host/
-       $(INSTALL_BIN) $(STAGING_DIR_HOST)/bin/* $(PKG_BUILD_DIR)/staging_dir/host/bin/
+       $(CP) $(PACKAGE_DIR) $(PKG_BUILD_DIR)/packages
+       $(CP) $(TOOLCHAIN_DIR)/bin $(PKG_BUILD_DIR)/staging_dir/host/
+       $(CP) $(STAGING_DIR_HOST)/bin/* $(PKG_BUILD_DIR)/staging_dir/host/bin/
        $(CP) $(TOPDIR)/target/linux $(PKG_BUILD_DIR)/target/
        rm -rf \
                $(PKG_BUILD_DIR)/target/linux/*/patches \