aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jo@mein.io>2017-01-19 20:41:46 +0100
committerJo-Philipp Wich <jo@mein.io>2017-01-19 20:47:52 +0100
commitcf5f7aa0b6a8ea220ec31c01324ad715ebaa6392 (patch)
tree293f50f3939699f3147040f52c2ac3dc2f0efe15
parent4039b3eba1cfdfd0025e91c5c5d45b76425ad5c8 (diff)
downloadupstream-cf5f7aa0b6a8ea220ec31c01324ad715ebaa6392.tar.gz
upstream-cf5f7aa0b6a8ea220ec31c01324ad715ebaa6392.tar.bz2
upstream-cf5f7aa0b6a8ea220ec31c01324ad715ebaa6392.zip
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 <jo@mein.io>
-rw-r--r--target/sdk/Makefile2
1 files changed, 1 insertions, 1 deletions
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)))