imagebuilder: various fixes

 * only copy host tools from $(STAGING_DIR_HOST)/bin
 * remove more target patches, and also target files
 * combine the 3 find commands into a single one

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20597 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index 923c1e9..e0b64ea 100644 (file)
--- a/target/imagebuilder/Makefile
+++ b/target/imagebuilder/Makefile
@@ -31,17 +31,15 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2: clean
                $(TMP_DIR)/.packageinfo \
                $(PKG_BUILD_DIR)/
        $(CP) $(PACKAGE_DIR) $(PKG_BUILD_DIR)/packages
                $(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 \
        $(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
        -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:
        $(TAR) c -C $(BUILD_DIR) $(IB_NAME) | bzip2 -c > $@
 
 download: