X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=target%2Fimagebuilder%2FMakefile;h=925dc80adc88c31ae7ccab4f6959d1516cedfd3e;hp=3d830bbc2d79a2f05ac99653678ac9a4d1aba4c7;hb=541169c27ca666c53bf363212218ade85ff3feb3;hpb=19ac0e58d8a4e863321f8e3fdfa586e6489fc723

diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index 3d830bbc2d..925dc80adc 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)
@@ -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 \
-		$(TMP_DIR)/.pkginfo \
+		$(TMP_DIR)/.packageinfo \
 		$(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
-	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); \
 	)