From: Jo-Philipp Wich Date: Thu, 19 Jan 2017 19:41:46 +0000 (+0100) Subject: sdk: avoid using private repository clone urls as base repo entry X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ada6d9fecaf5147db51b7f27c548eb66590d8500;p=openwrt%2Fstaging%2Fkaloz.git sdk: avoid using private repository clone urls as base repo entry Only consider the repository origin url as valid base feed entry if it is a git://, http:// or https:// location. Signed-off-by: Jo-Philipp Wich --- diff --git a/target/sdk/Makefile b/target/sdk/Makefile index 496f025393..c93e317458 100644 --- a/target/sdk/Makefile +++ b/target/sdk/Makefile @@ -36,7 +36,7 @@ SDK_DIRS = \ $(STAGING_SUBDIR_HOST) \ $(STAGING_SUBDIR_TOOLCHAIN) -BASE_FEED:=$(shell git config --get remote.origin.url 2>/dev/null | sed -ne 's/^/src-git base /p') +BASE_FEED:=$(shell git config --get remote.origin.url 2>/dev/null | sed -ne '\#\(git\|http\|https\)://#s/^/src-git base /p') BASE_FEED:=$(if $(BASE_FEED),$(BASE_FEED),$(shell cd $(TOPDIR); LC_ALL=C git svn info 2>/dev/null | sed -ne 's/^URL: /src-gitsvn base /p')) BASE_FEED:=$(if $(BASE_FEED),$(BASE_FEED),$(shell cd $(TOPDIR); LC_ALL=C svn info 2>/dev/null | sed -ne 's/^URL: /src-svn base /p')) BASE_FEED:=$(if $(BASE_FEED),$(BASE_FEED),src-git base https://git.lede-project.org/source.git$(filter-out ;master,;$(shell git rev-parse --abbrev-ref HEAD)))