X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=target%2Fimagebuilder%2FMakefile;h=925dc80adc88c31ae7ccab4f6959d1516cedfd3e;hb=dc0f6ad85a0305c858008c43384706bf09f9c8f6;hp=b59b265adcfecc1ff0ece30ff9ef64c33087cd6f;hpb=e0a55bf1acef8ca64fb3bdf9df93586e909cc617;p=openwrt-10.03%2F.git diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile index b59b265ad..925dc80ad 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,6 +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)/.packageinfo \ $(TMP_DIR)/.targetinfo \ ./files/Makefile \ $(IB_BUILD_DIR)/ @@ -32,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 | 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); \ )