diff options
| author | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-03-30 11:41:51 +0000 |
|---|---|---|
| committer | nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2010-03-30 11:41:51 +0000 |
| commit | 87d817ac8c7259389f321d5f707e8c223c3dd487 (patch) | |
| tree | 451f520a257429377a689d257a35d1c638f0f9a4 /target/imagebuilder | |
| parent | 37bcda62c00cb40d73bcee1ba10adfdea432dc7a (diff) | |
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
Diffstat (limited to 'target/imagebuilder')
| -rw-r--r-- | target/imagebuilder/Makefile | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/target/imagebuilder/Makefile b/target/imagebuilder/Makefile index 923c1e94b..e0b64ead4 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: |