X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/bca7ac77bf1981587e65d397ab25a7a6f3cc35ad..b4c2371ebb2af4f08a7928bba82a3c3f77989f3e:/target/imagebuilder/Makefile

diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index 9b3700ece..ed051eceb 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)
@@ -29,7 +29,7 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2: clean
 		$(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