diff options
| author | Christian Marangi | 2025-12-04 18:08:08 +0000 |
|---|---|---|
| committer | Christian Marangi | 2025-12-04 18:24:30 +0000 |
| commit | 9c23ecf31cf5edd413916edb5c133de1e2b6d04b (patch) | |
| tree | 28d8da446d2841db3326b5d0ffbb18d8e55cf22a | |
| parent | 96a67d2f2eef8d1f0760bf826ab187fb6e75671b (diff) | |
| download | openwrt-9c23ecf31cf5edd413916edb5c133de1e2b6d04b.tar.gz | |
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 0338dd44d5755fdd9bd38ce18e823cc024979240)
| -rw-r--r-- | target/sdk/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/target/sdk/Makefile b/target/sdk/Makefile index a2eb35c1d4..da1fb949ef 100644 --- a/target/sdk/Makefile +++ b/target/sdk/Makefile @@ -41,7 +41,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 master main 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-full base $(GIT_URL)$(if $(GIT_BRANCH),;$(GIT_BRANCH),$(if $(GIT_TAGNAME),;$(GIT_TAGNAME)))) |