X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=target%2Fsdk%2FMakefile;h=4607535292c89d0f04ba766137abc662f05c4053;hb=d3b21bb2bb4caba0371ddbec19c080bc42f095c7;hp=0246afbb8790962997329806313d149d4bc504bd;hpb=0f6f518e7aff35e2aad140755f49962c9266820a;p=oweals%2Fopenwrt.git

diff --git a/target/sdk/Makefile b/target/sdk/Makefile
index 0246afbb87..4607535292 100644
--- a/target/sdk/Makefile
+++ b/target/sdk/Makefile
@@ -1,5 +1,6 @@
 # 
 # Copyright (C) 2006-2014 OpenWrt.org
+# Copyright (C) 2016 LEDE Project
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -12,13 +13,13 @@ include $(INCLUDE_DIR)/version.mk
 
 override MAKEFLAGS=
 
-SDK_NAME:=$(VERSION_DIST)-SDK-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))$(if $(GCCV),_gcc-$(GCCV))$(DIR_SUFFIX).$(HOST_OS)-$(HOST_ARCH)
+SDK_NAME:=$(VERSION_DIST_SANITIZED)-sdk-$(if $(CONFIG_VERSION_FILENAMES),$(VERSION_NUMBER)-)$(BOARD)$(if $(SUBTARGET),-$(SUBTARGET))$(if $(GCCV),_gcc-$(GCCV))$(DIR_SUFFIX).$(HOST_OS)-$(HOST_ARCH)
 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)
 
-EXCLUDE_DIRS:=*/ccache \
+EXCLUDE_DIRS:=*/ccache/* \
 	*/stamp \
 	*/stampfiles \
 	*/man \
@@ -69,6 +70,8 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
 	$(CP) $(INCLUDE_DIR) $(SCRIPT_DIR) $(TOPDIR)/docs $(SDK_BUILD_DIR)/
 	$(TAR) -cf - -C $(TOPDIR) \
 		`cd $(TOPDIR); find $(KDIR_BASE) -name \*.ko` \
+		`cd $(TOPDIR); find $(KDIR_BASE)/firmware/ -newer $(KDIR_BASE)/firmware/Makefile \
+			-type f -name '*.bin' -or -name '*.cis' -or -name '*.csp' -or -name '*.dsp' -or -name '*.fw'` \
 		$(foreach exclude,$(EXCLUDE_DIRS),--exclude="$(exclude)") \
 		$(SDK_DIRS) $(KERNEL_FILES) | \
 		$(TAR) -xf - -C $(SDK_BUILD_DIR)
@@ -96,7 +99,6 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
 	$(CP) -L \
 		$(TOPDIR)/LICENSE \
 		$(TOPDIR)/rules.mk \
-		$(TOPDIR)/.config \
 		./files/Config.in \
 		./files/Makefile \
 		./files/include/prepare.mk \
@@ -104,6 +106,8 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
 		$(SDK_BUILD_DIR)/
 	$(CP) \
 		$(TOPDIR)/package/Makefile \
+		$(TOPDIR)/package/libs/toolchain \
+		$(TOPDIR)/package/kernel/linux \
 		$(SDK_BUILD_DIR)/package/
 
 	-rm -f $(SDK_BUILD_DIR)/feeds.conf.default