From f7602bc1f147f635f8987457d96bd8f5b4cffd3b Mon Sep 17 00:00:00 2001 From: ElonH Date: Wed, 26 May 2021 22:33:34 +0800 Subject: [PATCH] sdk: generate correct base feed immortalwrt default branch is not master --- target/sdk/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/sdk/Makefile b/target/sdk/Makefile index dbb693b49c..8fc2ba1cf9 100644 --- a/target/sdk/Makefile +++ b/target/sdk/Makefile @@ -43,7 +43,7 @@ SDK_DIRS = \ 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_BRANCH:=$(filter-out 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 }') BASE_FEED:=$(if $(GIT_URL),src-git base $(GIT_URL)$(if $(GIT_BRANCH),;$(GIT_BRANCH),$(if $(GIT_TAGNAME),;$(GIT_TAGNAME))))