leave out the ccache directory when copying the staging dir into the sdk (#843)

SVN-Revision: 5081

diff --git a/target/Makefile b/target/Makefile
index 195878e6654d0e4c8fd35f50ceb14b07873c9891..dc21033e5f6bd04caed4d04657f7e77c364614b8 100644 (file)
--- 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 a8413562b2c9a1e8fb3fc7e13c53fccdea06d4e7..76e0afc788663f575300ac9d1be86ac3b566eb07 100644 (file)
--- 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); \