From: Don Zickus <dzickus@xxxxxxxxxx>
I would like to use the TAG variable as input to the make merge and
release targets. This allows the maintainer to control where the
merge or release starts from.
The internal variable TAG conflicts with this when the external TAG
is empty. The Makefile accidentally chooses the internal TAG variable.
Resolve this by renaming the internal TAG variable to _TAG. This
allows the scripts to pass in an external TAG variable with no
conflict.
The internal TAG variable is not used anywhere outside
Makefile.common.
No expected changes, purely cosmetic.
Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx>
---
redhat/Makefile.common | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/redhat/Makefile.common b/redhat/Makefile.common
index 6d048415ba6d..b335f3c77c7d 100644
--- a/redhat/Makefile.common
+++ b/redhat/Makefile.common
@@ -43,16 +43,16 @@ endif
ifeq ($(VERSION_ON_UPSTREAM),1)
# master is expected to track mainline.
MERGE_BASE:=$(shell git merge-base HEAD master)
- TAG:=$(shell git describe $(MERGE_BASE))
+ _TAG:=$(shell git describe $(MERGE_BASE))
# a snapshot off of a tagged git is of the form [tag]-[cnt]-g[hash]
- SNAPSHOT:=$(shell echo $(TAG) | grep -c '\-g')
+ SNAPSHOT:=$(shell echo $(_TAG) | grep -c '\-g')
else
SNAPSHOT:=0
endif
ifeq ($(SNAPSHOT),1)
# The base for generating tags is the snapshot commit
- MARKER:=$(shell echo $(TAG) | awk -F "-g" '{ print $$2 }')
+ MARKER:=$(shell echo $(_TAG) | awk -F "-g" '{ print $$2 }')
# The merge window is weird because the actual versioning hasn't
# been updated but we still need something that works for
# packaging. Fix this by bumping the patch level and marking
--
GitLab
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
