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 439a103428472f0817befd1c67321f286336f2f1..9b3700ece3065b48effbf8776c3bc40ab65aedcb 100644 (file)
--- a/target/imagebuilder/Makefile
+++ b/target/imagebuilder/Makefile
@@ -18,13 +18,14 @@ IB_BUILD_DIR:=$(BUILD_DIR)/$(IB_NAME)
 
 all: compile
 
-$(BIN_DIR)/$(IB_NAME).tar.bz2: FORCE
+$(BIN_DIR)/$(IB_NAME).tar.bz2: clean
        rm -rf $(IB_BUILD_DIR)
        mkdir -p $(IB_BUILD_DIR)/build_$(ARCH)/linux-$(KERNEL)-$(BOARD) $(IB_BUILD_DIR)/staging_dir_$(ARCH)/bin $(IB_BUILD_DIR)/target/linux
        $(CP) \
                $(INCLUDE_DIR) $(SCRIPT_DIR) $(PACKAGE_DIR) \
                $(TOPDIR)/rules.mk $(TOPDIR)/.config \
                $(TMP_DIR)/.target.mk \
+               $(TMP_DIR)/.packageinfo \
                $(TMP_DIR)/.targetinfo \
                ./files/Makefile \
                $(IB_BUILD_DIR)/
@@ -32,8 +33,8 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2: FORCE
        $(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 | xargs rm -rf 
-       find $(IB_BUILD_DIR) -name CVS | xargs 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); \
        )
@@ -43,5 +44,5 @@ prepare:
 compile: $(BIN_DIR)/$(IB_NAME).tar.bz2
 install: compile
 
-clean:
+clean: FORCE
        rm -rf $(IB_BUILD_DIR) $(BIN_DIR)/$(IB_NAME).tar.bz2