- correctly copy .config when scripts/env is used in the buildroot - prevent user...

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

diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index 923c1e94b786a6ba8860d55960433405550c3a99..42fb7bb69b1fe70429ca8f97b17bdc9d65b40891 100644 (file)
--- a/target/imagebuilder/Makefile
+++ b/target/imagebuilder/Makefile
@@ -23,25 +23,24 @@ all: compile
 $(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 $(TOPDIR)/.config $(PKG_BUILD_DIR)/.config
        $(CP) \
                $(INCLUDE_DIR) $(SCRIPT_DIR) \
-               $(TOPDIR)/rules.mk $(TOPDIR)/.config \
+               $(TOPDIR)/rules.mk \
                ./files/Makefile \
                $(TMP_DIR)/.targetinfo \
                $(TMP_DIR)/.packageinfo \
                $(PKG_BUILD_DIR)/
        $(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) $(STAGING_DIR_HOST)/bin $(PKG_BUILD_DIR)/staging_dir/host/
        $(CP) $(TOPDIR)/target/linux $(PKG_BUILD_DIR)/target/
        rm -rf \
-               $(PKG_BUILD_DIR)/target/linux/*/patches \
-               $(PKG_BUILD_DIR)/target/linux/*/*/patches
+               $(PKG_BUILD_DIR)/target/linux/*/files{,-*} \
+               $(PKG_BUILD_DIR)/target/linux/*/patches{,-*}
        -cp $(KERNEL_BUILD_DIR)/* $(IB_KDIR)/ # don't copy subdirectories here
        echo REVISION:="$(REVISION)" > $(PKG_BUILD_DIR)/include/version.mk
-       find $(PKG_BUILD_DIR) -name .svn | $(XARGS) rm -rf
-       find $(PKG_BUILD_DIR) -name CVS | $(XARGS) rm -rf
-       find $(PKG_BUILD_DIR) -name .git | $(XARGS) rm -rf
+       find $(PKG_BUILD_DIR) -name CVS -o -name .git -o -name .svn \
+         | $(XARGS) rm -rf
        $(TAR) c -C $(BUILD_DIR) $(IB_NAME) | bzip2 -c > $@
 
 download: