diff options
| author | Christian Marangi | 2025-12-04 18:08:08 +0000 |
|---|---|---|
| committer | Christian Marangi | 2025-12-04 18:08:08 +0000 |
| commit | 0338dd44d5755fdd9bd38ce18e823cc024979240 (patch) | |
| tree | b3b4d3abd2093af22a859a5d69756685a91dcda5 | |
| parent | 78a8cfb57772138ff5b925b9d69928e5878931bf (diff) | |
| download | openwrt-0338dd44d5755fdd9bd38ce18e823cc024979240.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>
| -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 d2daa06902..0e91778238 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 --root=package base $(GIT_URL)$(if $(GIT_BRANCH),;$(GIT_BRANCH),$(if $(GIT_TAGNAME),;$(GIT_TAGNAME)))) |