X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/b404f511e282df616e9f6056ee6e368df8d7b9da..cc23dc0144843f06abd25ec13ba2db72b1c141ce:/target/sdk/Makefile

diff --git a/target/sdk/Makefile b/target/sdk/Makefile
index 6c7560006..e171d831d 100644
--- a/target/sdk/Makefile
+++ b/target/sdk/Makefile
@@ -4,7 +4,6 @@
 # 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
@@ -15,16 +14,22 @@ override MAKEFLAGS=
 PKG_OS:=$(shell uname -s)
 PKG_CPU:=$(shell uname -m)
 
-SDK_NAME:=OpenWrt-SDK-$(BOARD)-for-$(PKG_OS)-$(PKG_CPU)
+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 */man */share */stampfiles */info
+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) $(foreach exclude,$(EXCLUDE_DIRS),--exclude="$(exclude)") --exclude="staging_dir/$(ARCH)" staging_dir | \
+	$(TAR) -cf - -C $(TOPDIR) $(foreach exclude,$(EXCLUDE_DIRS),--exclude="$(exclude)") --exclude="staging_dir/$(ARCH)" staging_dir/host staging_dir/target-$(ARCH)_$(LIBC)-$(LIBCV) staging_dir/toolchain-$(ARCH)_gcc-$(GCCV)_$(LIBC)-$(LIBCV) | \
 		$(TAR) -xf - -C $(SDK_BUILD_DIR)
 	mkdir -p $(SDK_BUILD_DIR)/target/linux
 	$(CP) $(GENERIC_PLATFORM_DIR) $(PLATFORM_DIR) $(SDK_BUILD_DIR)/target/linux/
@@ -33,7 +38,6 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
 		$(SDK_BUILD_DIR)/target/linux/*/patches
 	$(CP) \
 		$(TOPDIR)/LICENSE \
-		$(TOPDIR)/feeds.conf.default \
 		$(TOPDIR)/rules.mk \
 		$(TOPDIR)/.config \
 		./files/Config.in \
@@ -44,6 +48,10 @@ $(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
 		./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
 	echo REVISION:="$(REVISION)" > $(SDK_BUILD_DIR)/include/version.mk
 	find $(SDK_BUILD_DIR) -name .git | $(XARGS) rm -rf
 	find $(SDK_BUILD_DIR) -name .svn | $(XARGS) rm -rf