From: Jo-Philipp Wich Date: Sun, 17 Apr 2016 19:50:31 +0000 (+0200) Subject: sdk: fix generation of base feed url X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=0f6f518e7aff35e2aad140755f49962c9266820a;p=openwrt%2Fstaging%2Fnbd.git sdk: fix generation of base feed url Signed-off-by: Jo-Philipp Wich --- diff --git a/target/sdk/Makefile b/target/sdk/Makefile index 857a6b76f5..0246afbb87 100644 --- a/target/sdk/Makefile +++ b/target/sdk/Makefile @@ -37,7 +37,7 @@ SDK_DIRS = \ BASE_FEED:=$(shell git config --get remote.origin.url 2>/dev/null | sed -ne '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.openwrt.org/$(filter-out unknown/ r%/,$(subst $(space),.,$(wordlist 1,2,$(subst .,$(space),$(VERSION_NUMBER))))/)openwrt.git) +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))) KDIR_BASE = $(patsubst $(TOPDIR)/%,%,$(LINUX_DIR))