[source] sdk: restrict base feed repo to public git for CONFIG_BUILDBOT only

LEDE Commits lede-commits at lists.infradead.org
Tue Dec 5 13:57:05 PST 2017


rmilecki pushed a commit to source.git, branch master:
https://git.lede-project.org/deaf9597c67aa970c27c333d9c69e3c3ad046248

commit deaf9597c67aa970c27c333d9c69e3c3ad046248
Author: Rafał Miłecki <rafal at milecki.pl>
AuthorDate: Mon Dec 4 12:48:30 2017 +0100

    sdk: restrict base feed repo to public git for CONFIG_BUILDBOT only
    
    This allows people to build SDK from custom repository (git access using
    ssh) and keep original URL in SDK's feeds.conf.default.
    
    Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
    Acked-by: Jo-Philipp Wich <jo at mein.io>
---
 target/sdk/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/target/sdk/Makefile b/target/sdk/Makefile
index ae65fd1..bf8c3ca 100644
--- a/target/sdk/Makefile
+++ b/target/sdk/Makefile
@@ -36,7 +36,8 @@ SDK_DIRS = \
 		$(STAGING_SUBDIR_HOST) \
 		$(STAGING_SUBDIR_TOOLCHAIN)
 
-GIT_URL:=$(filter git://% http://% https://%,$(shell git config --get remote.origin.url 2>/dev/null))
+GIT_URL:=$(shell git config --get remote.origin.url 2>/dev/null)
+GIT_URL:=$(if $(CONFIG_BUILDBOT),$(filter git://% http://% https://%,$(GIT_URL)),$(GIT_URL))
 GIT_COMMIT:=$(shell git rev-parse HEAD 2>/dev/null)
 GIT_BRANCH:=$(filter-out master HEAD,$(shell git rev-parse --abbrev-ref HEAD 2>/dev/null))
 GIT_TAGNAME:=$(shell git show-ref --tags --dereference 2>/dev/null | sed -ne '/^$(GIT_COMMIT) / { s|^.*/||; s|\^.*||; p }')



More information about the lede-commits mailing list