X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/b806b008065672cf155ff31b757d36b8f67cac17..0f54272dce72f8847654af9035df07f33e49745b:/target/imagebuilder/Makefile

diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index 470d04564..ed051eceb 100644
--- a/target/imagebuilder/Makefile
+++ b/target/imagebuilder/Makefile
@@ -11,28 +11,30 @@ include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/host.mk
 
 PKG_OS:=$(shell uname -s)
-PKG_CPU:=$(shell uname -m)
+PKG_CPU:=$(shell uname -m | sed "s/ //g")
 
 IB_NAME:=OpenWrt-ImageBuilder-$(BOARD)-$(KERNEL)-for-$(PKG_OS)-$(PKG_CPU)
 IB_BUILD_DIR:=$(BUILD_DIR)/$(IB_NAME)
 
 all: compile
 
-$(BIN_DIR)/$(IB_NAME).tar.bz2:
+$(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)/
-	$(CP) $(STAGING_DIR)/bin/* $(IB_BUILD_DIR)/staging_dir_$(ARCH)/bin
+	$(CP) $(TOOLCHAIN_DIR)/bin/* $(IB_BUILD_DIR)/staging_dir_$(ARCH)/bin
 	$(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); \
 	)
@@ -42,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