From: Prarit Bhargava <prarit@xxxxxxxxxx>
redhat/Makefile.variables: Add ADD_COMMITID_TO_VERSION
As noted in ARK commit 40aae9752b8b ("Fix versioning on stable Fedora"),
adding the commit ID to all versions must be optional. Currently, the
centos-stream-9 repository does not have this feature and adding it would
cause a significant behavioral change in the dist-*-rpm and other targets.
Add ADD_COMMITID_TO_VERSION which makes adding the commit ID to the
version field optional.
Signed-off-by: Prarit Bhargava <prarit@xxxxxxxxxx>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -197,7 +197,7 @@ ifeq ($(VERSION_ON_UPSTREAM),1)
endif
else
SNAPSHOT:=0
- ifneq ("$(DISTRO)", "fedora")
+ ifneq ($(ADD_COMMITID_TO_VERSION),)
_EXACT_TAG:=$(shell $(GIT) describe --exact-match 2>/dev/null)
ifeq ($(_EXACT_TAG),)
_TAG:=$(shell $(GIT) describe 2>/dev/null)
diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables
index blahblah..blahblah 100644
--- a/redhat/Makefile.variables
+++ b/redhat/Makefile.variables
@@ -124,3 +124,7 @@ RHSELFTESTDATA ?=
# This variable is used by the redhat/self-tests. It should not be
# considered stable and my be changed or removed without warning.
RHDISTDATADIR ?=
+
+# This appends 5 characters of the top-of-tree commit ID to the BUILD variable,
+# which is then reflected in the package NVR.
+ADD_COMMITID_TO_VERSION ?=
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2021
_______________________________________________
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
Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
