From: Rafał Miłecki Date: Mon, 4 Dec 2017 11:48:30 +0000 (+0100) Subject: sdk: restrict base feed repo to public git for CONFIG_BUILDBOT only X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;ds=sidebyside;h=deaf9597c67aa970c27c333d9c69e3c3ad046248;p=openwrt%2Fstaging%2Flynxis.git 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 Acked-by: Jo-Philipp Wich --- 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 }')