X-Git-Url: http://git.archive.openwrt.org/?a=blobdiff_plain;f=target%2Fsdk%2FMakefile;h=1c696d5ac451dc18ed761ae2675014f8fb9ded29;hb=d0394e5c7c0189815ff8440c29ce3e4e55470986;hp=82b47cd946d4a546ea1c1e493aaccda6e3e8d537;hpb=e4ff815211ffeeab83a17d5aa4a4fb2cc51c668b;p=openwrt.git

diff --git a/target/sdk/Makefile b/target/sdk/Makefile
index 82b47cd946..1c696d5ac4 100644
--- a/target/sdk/Makefile
+++ b/target/sdk/Makefile
@@ -16,16 +16,27 @@ PKG_CPU:=$(word 1,$(subst -, ,$(shell $(HOSTCC) -dumpmachine)))
 
 SDK_NAME:=OpenWrt-SDK-$(BOARD)-for-$(PKG_OS)-$(PKG_CPU)-gcc-$(GCCV)_$(LIBC)-$(LIBCV)
 SDK_BUILD_DIR:=$(BUILD_DIR)/$(SDK_NAME)
+
+STAGING_SUBDIR_HOST := staging_dir/host
+STAGING_SUBDIR_TARGET := staging_dir/target-$(ARCH)$(ARCH_SUFFIX)_$(LIBC)-$(LIBCV)$(if $(CONFIG_arm),_eabi)
+STAGING_SUBDIR_TOOLCHAIN := staging_dir/toolchain-$(ARCH)$(ARCH_SUFFIX)_gcc-$(GCCV)_$(LIBC)-$(LIBCV)$(if $(CONFIG_arm),_eabi)
+
 EXCLUDE_DIRS:=*/ccache \
 	*/stamp \
 	*/stampfiles \
 	*/man \
 	*/info \
+	*/root-* \
+	initial \
+	*.install.clean \
+	*.install.flags \
+	*.install \
+	*/doc
 
 SDK_DIRS = \
-		staging_dir/host \
-		staging_dir/target-$(ARCH)$(ARCH_SUFFIX)_$(LIBC)-$(LIBCV)$(if $(CONFIG_arm),_eabi) \
-		staging_dir/toolchain-$(ARCH)$(ARCH_SUFFIX)_gcc-$(GCCV)_$(LIBC)-$(LIBCV)$(if $(CONFIG_arm),_eabi) \
+		$(STAGING_SUBDIR_HOST) \
+		$(STAGING_SUBDIR_TARGET) \
+		$(STAGING_SUBDIR_TOOLCHAIN)
 
 SVN_PACKAGE_URL=$(shell svn info ../../package | awk '/^URL:/ { print $$2; }')
 
@@ -57,14 +68,29 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
 	$(CP) $(INCLUDE_DIR) $(SCRIPT_DIR) $(TOPDIR)/docs $(SDK_BUILD_DIR)/
 	$(TAR) -cf - -C $(TOPDIR) \
 		$(foreach exclude,$(EXCLUDE_DIRS),--exclude="$(exclude)") \
-		--exclude="staging_dir/$(ARCH)" \
 		$(SDK_DIRS) $(KERNEL_FILES) | \
 		$(TAR) -xf - -C $(SDK_BUILD_DIR)
+
+	@-( \
+		find \
+			$(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/bin \
+			$(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/usr/bin \
+			$(SDK_BUILD_DIR)/$(STAGING_SUBDIR_TOOLCHAIN)/bin \
+			$(SDK_BUILD_DIR)/$(STAGING_SUBDIR_TOOLCHAIN)/*/bin \
+			$(SDK_BUILD_DIR)/$(STAGING_SUBDIR_TOOLCHAIN)/libexec \
+			-type f; \
+		find \
+			$(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/lib \
+			$(SDK_BUILD_DIR)/$(STAGING_SUBDIR_HOST)/usr/lib \
+			-type f -name \*.so\* -or -name \*.a; \
+	) | xargs strip 2>/dev/null >/dev/null
+
 	mkdir -p $(SDK_BUILD_DIR)/target/linux
 	$(CP) $(GENERIC_PLATFORM_DIR) $(PLATFORM_DIR) $(SDK_BUILD_DIR)/target/linux/
 	rm -rf \
-		$(SDK_BUILD_DIR)/target/linux/*/files \
-		$(SDK_BUILD_DIR)/target/linux/*/patches
+		$(SDK_BUILD_DIR)/target/linux/*/files* \
+		$(SDK_BUILD_DIR)/target/linux/*/patches*
+	./convert-config.pl $(TOPDIR)/.config > $(SDK_BUILD_DIR)/Config-build.in
 	$(CP) -L \
 		$(TOPDIR)/LICENSE \
 		$(TOPDIR)/rules.mk \
@@ -74,7 +100,6 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
 		./files/README.SDK \
 		$(SDK_BUILD_DIR)/
 	$(CP) \
-		./files/package/rules.mk \
 		$(TOPDIR)/package/Makefile \
 		$(SDK_BUILD_DIR)/package/
 	$(if $(SVN_PACKAGE_URL),echo "src-svn trunk $(SVN_PACKAGE_URL)" \
@@ -83,6 +108,7 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
 	cat $(TOPDIR)/feeds.conf.default \
 		>> $(SDK_BUILD_DIR)/feeds.conf.default
 	$(SED) 's,^# REVISION:=.*,REVISION:=$(REVISION),g' $(SDK_BUILD_DIR)/include/version.mk
+	$(SED) '/LINUX_VERMAGIC:=/ { s,unknown,$(LINUX_VERMAGIC),g }' $(SDK_BUILD_DIR)/include/kernel.mk
 	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