X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=blobdiff_plain;f=target%2Fsdk%2FMakefile;h=51bf47b420eae89741b284d460f4072e23f404a7;hp=d65b934c95342168ead7b8a8c6e50a01a82e619c;hb=951215d74799ef2f4c28f70433008ae0b69822c1;hpb=e0a55bf1acef8ca64fb3bdf9df93586e909cc617

diff --git a/target/sdk/Makefile b/target/sdk/Makefile
index d65b934c95..51bf47b420 100644
--- a/target/sdk/Makefile
+++ b/target/sdk/Makefile
@@ -1,42 +1,65 @@
 # 
-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/host.mk
 
-PKG_OS:=$(shell uname -s)
-PKG_CPU:=$(shell uname -m)
+override MAKEFLAGS=
 
-SDK_NAME:=OpenWrt-SDK-$(BOARD)-$(KERNEL)-for-$(PKG_OS)-$(PKG_CPU)
+PKG_OS:=$(word 2,$(subst -, ,$(shell $(HOSTCC) -dumpmachine)))
+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)
+EXCLUDE_DIRS:=*/ccache \
+	*/stamp \
+	*/stampfiles \
+	*/man \
+	*/info
+
+SVN_PACKAGE_URL=$(shell svn info ../../package | awk '/^URL:/ { print $$2; }')
 
 all: compile
 
 $(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
 	mkdir -p $(SDK_BUILD_DIR)/dl $(SDK_BUILD_DIR)/package
 	$(CP) $(INCLUDE_DIR) $(SCRIPT_DIR) $(TOPDIR)/docs $(SDK_BUILD_DIR)/
-	$(TAR) -cf - -C $(TOPDIR) --exclude=ccache/ staging_dir_$(ARCH) | \
+	$(TAR) -cf - -C $(TOPDIR) \
+		$(foreach exclude,$(EXCLUDE_DIRS),--exclude="$(exclude)") \
+		--exclude="staging_dir/$(ARCH)" \
+		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) | \
 		$(TAR) -xf - -C $(SDK_BUILD_DIR)
-	(cd $(SDK_BUILD_DIR)/staging_dir_$(ARCH); \
-		rm -rf info man share stampfiles; \
-		cd usr; \
-		rm -rf doc info man share; \
-	)
-	$(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 
+	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
+	$(CP) -L \
+		$(TOPDIR)/LICENSE \
+		$(TOPDIR)/rules.mk \
+		$(TOPDIR)/.config \
+		./files/Config.in \
+		./files/Makefile \
+		./files/README.SDK \
+		$(SDK_BUILD_DIR)/
+	$(CP) \
+		./files/package/rules.mk \
+		$(TOPDIR)/package/Makefile \
+		$(SDK_BUILD_DIR)/package/
+	echo "src-svn trunk $(SVN_PACKAGE_URL)" \
+		> $(SDK_BUILD_DIR)/feeds.conf.default
+	cat $(TOPDIR)/feeds.conf.default \
+		>> $(SDK_BUILD_DIR)/feeds.conf.default
+	$(SED) 's,^# REVISION:=.*,REVISION:=$(REVISION),g' $(SDK_BUILD_DIR)/include/version.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
 	(cd $(BUILD_DIR); \
 		tar cfj $@ $(SDK_NAME); \
 	)