sdk: clean scripts/config before packing tarball (FS#504)

[openwrt/openwrt.git] / target / sdk / Makefile

diff --git a/target/sdk/Makefile b/target/sdk/Makefile
index 47a7382d240712393e9efdd6d5851842688334bb..ecaa0155950ee32f33cc2712ec0afec3256f3a57 100644 (file)
--- a/target/sdk/Makefile
+++ b/target/sdk/Makefile
@@ -17,7 +17,8 @@ SDK_NAME:=$(VERSION_DIST_SANITIZED)-sdk-$(if $(CONFIG_VERSION_FILENAMES),$(VERSI
 SDK_BUILD_DIR:=$(BUILD_DIR)/$(SDK_NAME)
 
 STAGING_SUBDIR_HOST := staging_dir/host
-STAGING_SUBDIR_TOOLCHAIN := staging_dir/toolchain-$(ARCH)$(ARCH_SUFFIX)_gcc-$(GCCV)_$(LIBC)-$(LIBCV)$(if $(CONFIG_arm),_eabi)
+STAGING_SUBDIR_TARGET := staging_dir/$(TARGET_DIR_NAME)
+STAGING_SUBDIR_TOOLCHAIN := staging_dir/toolchain-$(ARCH)$(ARCH_SUFFIX)_gcc-$(GCCV)_$(LIBC)$(if $(CONFIG_arm),_eabi)
 
 EXCLUDE_DIRS:=*/ccache/* \
        */stamp \
@@ -118,6 +119,11 @@ $(BIN_DIR)/$(SDK_NAME).tar.xz: clean
                $(TOPDIR)/package/kernel/linux \
                $(SDK_BUILD_DIR)/package/
 
+       -rm -rf \
+               $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/ccache \
+               $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_TARGET)/ccache \
+               $(SDK_BUILD_DIR)/$(STAGING_SUBDIR_TOOLCHAIN)/ccache
+
        -rm -f $(SDK_BUILD_DIR)/feeds.conf.default
        $(if $(BASE_FEED),echo "$(BASE_FEED)" > $(SDK_BUILD_DIR)/feeds.conf.default)
        if [ -f $(TOPDIR)/feeds.conf ]; then \
@@ -131,6 +137,7 @@ $(BIN_DIR)/$(SDK_NAME).tar.xz: clean
        find $(SDK_BUILD_DIR) -name .git | $(XARGS) rm -rf
        find $(SDK_BUILD_DIR) -name .svn | $(XARGS) rm -rf
        find $(SDK_BUILD_DIR) -name CVS | $(XARGS) rm -rf
+       -make -C $(SDK_BUILD_DIR)/scripts/config clean
        (cd $(BUILD_DIR); \
                tar -I 'xz -7e' -cf $@ $(SDK_NAME); \
        )