X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/62adcb808c8ff00b33280f3df32c6af41dd1f07f..2b2bc6c3ccaff20a2b7767cd9ead475c0be040f8:/target/imagebuilder/Makefile

diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index 0cbbfa283..0dae2b12e 100644
--- a/target/imagebuilder/Makefile
+++ b/target/imagebuilder/Makefile
@@ -11,7 +11,7 @@ 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)
@@ -24,17 +24,17 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2: clean
 	$(CP) \
 		$(INCLUDE_DIR) $(SCRIPT_DIR) $(PACKAGE_DIR) \
 		$(TOPDIR)/rules.mk $(TOPDIR)/.config \
-		$(TMP_DIR)/.target.mk \
-		$(TMP_DIR)/.pkginfo \
+		$(INCLUDE_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); \
 	)