fix target rescan (version kernel changes)

[openwrt/svn-archive/archive.git] / target / imagebuilder / Makefile

diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index d96a27674b8470d7a0d904db2b8b9e84852804ba..9b3700ece3065b48effbf8776c3bc40ab65aedcb 100644 (file)
--- a/target/imagebuilder/Makefile
+++ b/target/imagebuilder/Makefile
@@ -25,7 +25,7 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2: clean
                $(INCLUDE_DIR) $(SCRIPT_DIR) $(PACKAGE_DIR) \
                $(TOPDIR)/rules.mk $(TOPDIR)/.config \
                $(TMP_DIR)/.target.mk \
                $(INCLUDE_DIR) $(SCRIPT_DIR) $(PACKAGE_DIR) \
                $(TOPDIR)/rules.mk $(TOPDIR)/.config \
                $(TMP_DIR)/.target.mk \

-               $(TMP_DIR)/.pkginfo \
+               $(TMP_DIR)/.packageinfo \

                $(TMP_DIR)/.targetinfo \
                ./files/Makefile \
                $(IB_BUILD_DIR)/
                $(TMP_DIR)/.targetinfo \
                ./files/Makefile \
                $(IB_BUILD_DIR)/


@@ -33,8 +33,8 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2: clean
        $(CP) $(TOPDIR)/target/linux/* $(IB_BUILD_DIR)/target/linux
        rm -rf $(IB_BUILD_DIR)/target/linux/*/patches
        -cp $(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)/* $(IB_BUILD_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD) # don't copy subdirectories here
        $(CP) $(TOPDIR)/target/linux/* $(IB_BUILD_DIR)/target/linux
        rm -rf $(IB_BUILD_DIR)/target/linux/*/patches
        -cp $(BUILD_DIR)/linux-$(KERNEL)-$(BOARD)/* $(IB_BUILD_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD) # don't copy subdirectories here

-       find $(IB_BUILD_DIR) -name .svn -exec rm -rf {} +
-       find $(IB_BUILD_DIR) -name CVS -exec rm -rf  {} +
+       find $(IB_BUILD_DIR) -name .svn | $(XARGS) rm -rf
+       find $(IB_BUILD_DIR) -name CVS | $(XARGS) rm -rf

        (cd $(BUILD_DIR); \
                tar cfj $@ $(IB_NAME); \
        )
        (cd $(BUILD_DIR); \
                tar cfj $@ $(IB_NAME); \
        )