diff mbox series

[LEDE-DEV] sdk: restrict base feed repo to public git for CONFIG_BUILDBOT only

Message ID 20171204114830.28544-1-zajec5@gmail.com
State Accepted
Headers show
Series [LEDE-DEV] sdk: restrict base feed repo to public git for CONFIG_BUILDBOT only | expand

Commit Message

Rafał Miłecki Dec. 4, 2017, 11:48 a.m. UTC 
From: Rafał Miłecki <rafal@milecki.pl>

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@milecki.pl>
---
 target/sdk/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Jo-Philipp Wich Dec. 5, 2017, 8:19 p.m. UTC | #1 
Hi Rafał,

> 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@milecki.pl>

Acked-by: Jo-Philipp Wich <jo@mein.io>
diff mbox series

Patch

diff --git a/target/sdk/Makefile b/target/sdk/Makefile
index ae65fd1c8f..bf8c3ca2c6 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 }')