Skip to content

Commit 9c23ecf

Browse files
committed
sdk: filter out main on GIT_BRANCH parsing
Branch named main was never filter out on parsing the GIT_BRANCH define. Add main to the name of branch that should be filtered. Signed-off-by: Christian Marangi <ansuelsmth@gmail.com> (cherry picked from commit 0338dd4)
1 parent 96a67d2 commit 9c23ecf

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

target/sdk/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ SDK_DIRS = \
4141
GIT_URL:=$(shell git config --get remote.origin.url 2>/dev/null)
4242
GIT_URL:=$(if $(CONFIG_BUILDBOT),$(filter git://% http://% https://%,$(GIT_URL)),$(GIT_URL))
4343
GIT_COMMIT:=$(shell git rev-parse HEAD 2>/dev/null)
44-
GIT_BRANCH:=$(filter-out master HEAD,$(shell git rev-parse --abbrev-ref HEAD 2>/dev/null))
44+
GIT_BRANCH:=$(filter-out master main HEAD,$(shell git rev-parse --abbrev-ref HEAD 2>/dev/null))
4545
GIT_TAGNAME:=$(shell git show-ref --tags --dereference 2>/dev/null | sed -ne '/^$(GIT_COMMIT) / { s|^.*/||; s|\^.*||; p }')
4646

4747
BASE_FEED:=$(if $(GIT_URL),src-git-full base $(GIT_URL)$(if $(GIT_BRANCH),;$(GIT_BRANCH),$(if $(GIT_TAGNAME),;$(GIT_TAGNAME))))

0 commit comments

Comments
 (0)