From: nico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Wed, 24 Sep 2008 17:11:41 +0000 (+0000)
Subject: allow SDK to install trunk packages with scripts/feeds & build them, instead of tryin... 
X-Git-Url: https://git.rohieb.name/openwrt.git/commitdiff_plain/e804791ab2c129e53a75ed60712a7fc182b9a054

allow SDK to install trunk packages with scripts/feeds & build them, instead of trying to embed precompiled ones (closes: #3097)


git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12689 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/target/sdk/Makefile b/target/sdk/Makefile
index 6c7560006..2b9ceff6c 100644
--- a/target/sdk/Makefile
+++ b/target/sdk/Makefile
@@ -19,6 +19,8 @@ SDK_NAME:=OpenWrt-SDK-$(BOARD)-for-$(PKG_OS)-$(PKG_CPU)
 SDK_BUILD_DIR:=$(BUILD_DIR)/$(SDK_NAME)
 EXCLUDE_DIRS:=*/ccache */stamp */man */share */stampfiles */info
 
+SVN_PACKAGE_URL=$(shell svn info ../../package | awk '/^URL:/ { print $$2; }')
+
 all: compile
 
 $(BIN_DIR)/$(SDK_NAME).tar.bz2: clean
@@ -33,7 +35,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 +45,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