[openwrt/openwrt] sdk: filter out main on GIT_BRANCH parsing
LEDE Commits
lede-commits at lists.infradead.org
Thu Dec 4 10:26:19 PST 2025
ansuel pushed a commit to openwrt/openwrt.git, branch openwrt-24.10:
https://git.openwrt.org/9c23ecf31cf5edd413916edb5c133de1e2b6d04b
commit 9c23ecf31cf5edd413916edb5c133de1e2b6d04b
Author: Christian Marangi <ansuelsmth at gmail.com>
AuthorDate: Thu Dec 4 19:08:08 2025 +0100
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 at gmail.com>
(cherry picked from commit 0338dd44d5755fdd9bd38ce18e823cc024979240)
---
target/sdk/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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))))
More information about the lede-commits
mailing list