diff options
| author | Nicolas Thill <nico@openwrt.org> | 2010-03-30 11:41:51 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2010-03-30 11:41:51 +0000 |
| commit | 8c2b75332917c556e8bb307ceee6d9d2e511dde5 (patch) | |
| tree | 7aa11e854dfebad4e0402516633a2b2d66d5f23f | |
| parent | 3ad14f304efc1f6dc27ad3251c6da59e7924aab5 (diff) | |
| download | upstream-8c2b75332917c556e8bb307ceee6d9d2e511dde5.tar.gz upstream-8c2b75332917c556e8bb307ceee6d9d2e511dde5.tar.bz2 upstream-8c2b75332917c556e8bb307ceee6d9d2e511dde5.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
SVN-Revision: 20597
| -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 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: |