From: Jan Stancek <jstancek@xxxxxxxxxx> redhat: support BUILDID again CKI, scripts and people are already used to using BUILDID. Make it consistent across current and previous versions and support BUILDID again for backwards compatibility. Fixes https://gitlab.com/cki-project/kernel-ark/-/issues/167 Signed-off-by: Jan Stancek <jstancek@xxxxxxxxxx> diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -110,8 +110,14 @@ ifneq ($(wildcard $(LOCVERFILE)),) $(info DISTLOCALVERSION is "$(DISTLOCALVERSION)". Update '$(shell dirname $(REDHAT))/localversion' to change.) endif else - ifeq ($(DISTLOCALVERSION),) - DISTLOCALVERSION:=.test + ifeq ($(origin BUILDID),undefined) + ifeq ($(DISTLOCALVERSION),) + DISTLOCALVERSION:=.test + endif + else + # Do NOT drop the ability to use BUILDID! Keep backwards compatibility to be + # able to build all RHEL kernels the same way. + DISTLOCALVERSION:=$(BUILDID) endif ifeq (,$(findstring s,$(firstword -$(MAKEFLAGS)))) $(info DISTLOCALVERSION is "$(DISTLOCALVERSION)".) -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3443 -- _______________________________________________ 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
