aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Thill <nico@openwrt.org>2010-03-30 11:41:51 +0000
committerNicolas Thill <nico@openwrt.org>2010-03-30 11:41:51 +0000
commit75b21b145a84930f3a9be545fe423ef7014e75ac (patch)
tree451f520a257429377a689d257a35d1c638f0f9a4
parentcfafa180126f5cc987be0bb662fb4c64cbd0bfe2 (diff)
downloadupstream-75b21b145a84930f3a9be545fe423ef7014e75ac.tar.gz
upstream-75b21b145a84930f3a9be545fe423ef7014e75ac.tar.bz2
upstream-75b21b145a84930f3a9be545fe423ef7014e75ac.zip
imagebuilder: various fixes
* only copy host tools from $(STAGING_DIR_HOST)/bin * remove more target patches, and also target files * combine the 3 find commands into a single one git-svn-id: svn://svn.openwrt.org/openwrt/trunk@20597 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/imagebuilder/Makefile12
1 files changed, 5 insertions, 7 deletions
diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile
index 923c1e94b7..e0b64ead47 100644
--- a/target/imagebuilder/Makefile
+++ b/target/imagebuilder/Makefile
@@ -31,17 +31,15 @@ $(BIN_DIR)/$(IB_NAME).tar.bz2: clean
$(TMP_DIR)/.packageinfo \
$(PKG_BUILD_DIR)/
$(CP) $(PACKAGE_DIR) $(PKG_BUILD_DIR)/packages
- $(CP) $(TOOLCHAIN_DIR)/bin $(PKG_BUILD_DIR)/staging_dir/host/
- $(CP) $(STAGING_DIR_HOST)/bin/* $(PKG_BUILD_DIR)/staging_dir/host/bin/
+ $(CP) $(STAGING_DIR_HOST)/bin $(PKG_BUILD_DIR)/staging_dir/host/
$(CP) $(TOPDIR)/target/linux $(PKG_BUILD_DIR)/target/
rm -rf \
- $(PKG_BUILD_DIR)/target/linux/*/patches \
- $(PKG_BUILD_DIR)/target/linux/*/*/patches
+ $(PKG_BUILD_DIR)/target/linux/*/files{,-*} \
+ $(PKG_BUILD_DIR)/target/linux/*/patches{,-*}
-cp $(KERNEL_BUILD_DIR)/* $(IB_KDIR)/ # don't copy subdirectories here
echo REVISION:="$(REVISION)" > $(PKG_BUILD_DIR)/include/version.mk
- find $(PKG_BUILD_DIR) -name .svn | $(XARGS) rm -rf
- find $(PKG_BUILD_DIR) -name CVS | $(XARGS) rm -rf
- find $(PKG_BUILD_DIR) -name .git | $(XARGS) rm -rf
+ find $(PKG_BUILD_DIR) -name CVS -o -name .git -o -name .svn \
+ | $(XARGS) rm -rf
$(TAR) c -C $(BUILD_DIR) $(IB_NAME) | bzip2 -c > $@
download: