diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2006-10-14 14:16:26 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2006-10-14 14:16:26 +0000 |
| commit | f1d6fb4be149cd364524ff1db63a3f8a98f7ab7e (patch) | |
| tree | 5185dc7cab405d8cf7ace1bad16391faa3c0cfa3 | |
| parent | d4e038fe5dfdc4e3cff41be1bdd133c5a2af6542 (diff) | |
| download | upstream-f1d6fb4be149cd364524ff1db63a3f8a98f7ab7e.tar.gz upstream-f1d6fb4be149cd364524ff1db63a3f8a98f7ab7e.tar.bz2 upstream-f1d6fb4be149cd364524ff1db63a3f8a98f7ab7e.zip | |
leave out the ccache directory when copying the staging dir into the sdk (#843)
SVN-Revision: 5081
| -rw-r--r-- | target/Makefile | 1 | ||||
| -rw-r--r-- | target/sdk/Makefile | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/target/Makefile b/target/Makefile index 195878e665..dc21033e5f 100644 --- a/target/Makefile +++ b/target/Makefile @@ -17,7 +17,6 @@ TARGETS-$(CONFIG_SDK) += sdk linux-compile: utils-install linux-install: $(BIN_DIR) -sdk-compile: linux-install image_install: linux-install download: $(patsubst %,%-download,$(TARGETS-y)) diff --git a/target/sdk/Makefile b/target/sdk/Makefile index a8413562b2..76e0afc788 100644 --- a/target/sdk/Makefile +++ b/target/sdk/Makefile @@ -8,6 +8,7 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk +include $(INCLUDE_DIR)/host.mk PKG_OS:=$(shell uname -s) PKG_CPU:=$(shell uname -m) @@ -25,13 +26,16 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2: ) rm -rf $(SDK_BUILD_DIR) mkdir -p $(SDK_BUILD_DIR)/dl $(SDK_BUILD_DIR)/package - $(CP) $(STAGING_DIR) $(INCLUDE_DIR) $(SCRIPT_DIR) $(TOPDIR)/docs $(SDK_BUILD_DIR)/ + $(CP) $(INCLUDE_DIR) $(SCRIPT_DIR) $(TOPDIR)/docs $(SDK_BUILD_DIR)/ + $(TAR) -cf - -C $(TOPDIR) --exclude=ccache/ staging_dir_$(ARCH) | \ + $(TAR) -xf - -C $(SDK_BUILD_DIR) $(CP) $(TOPDIR)/rules.mk $(TOPDIR)/.config $(SDK_BUILD_DIR)/ $(CP) $(TOPDIR)/package/Makefile $(SDK_BUILD_DIR)/package/ $(CP) ./files/Makefile $(SDK_BUILD_DIR)/ $(CP) ./files/README.SDK $(SDK_BUILD_DIR)/ $(CP) ./files/package/rules.mk $(SDK_BUILD_DIR)/package/ echo OPENWRTVERSION:=$(OPENWRTVERSION) > $(SDK_BUILD_DIR)/.version.mk + rm -rf $(SDK_BUILD_DIR)/staging_dir*/ccache find $(SDK_BUILD_DIR) -name .svn | xargs rm -rf find $(SDK_BUILD_DIR) -name CVS | xargs rm -rf (cd $(BUILD_DIR); \ |