From: Prarit Bhargava <pra...@redhat.com>
redhat/Makefile: Rename BUILDID to LOCALVERSION
BUILDID isn't a very descriptive name. Rename the variable to
LOCALVERSION.
Signed-off-by: Prarit Bhargava <pra...@redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -116,13 +116,13 @@ endif
LOCVERFILE:=../localversion
# create an empty localversion file if you don't want a local buildid
ifneq ($(wildcard $(LOCVERFILE)),)
- BUILDID:=$(shell cat $(LOCVERFILE))
- $(info BUILDID is "$(BUILDID)". Update '$(shell dirname
$(REDHAT))/localversion' to change.)
+ LOCALVERSION:=$(shell cat $(LOCVERFILE))
+ $(info LOCALVERSION is "$(LOCALVERSION)". Update '$(shell dirname
$(REDHAT))/localversion' to change.)
else
- ifeq ($(BUILDID),)
- BUILDID:=.test
+ ifeq ($(LOCALVERSION),)
+ LOCALVERSION:=.test
endif
- $(info BUILDID is "$(BUILDID)".)
+ $(info LOCALVERSION is "$(LOCALVERSION)".)
endif
# options for process_configs.sh script
@@ -220,7 +220,7 @@ endif
# The NVR looks like, for example,
kernel-5.17.0-0.rc8.551acdc3c3d2.124.test.fc35.
# This string can be deconstructed as
#
-#
$(PACKAGE_NAME)-$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)-$(PREBUILD)$(BUILD)$(BUILDID)$(DIST)
+#
$(PACKAGE_NAME)-$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)-$(PREBUILD)$(BUILD)$(LOCALVERSION)$(DIST)
#
# This can be evaluated as
#
@@ -229,7 +229,7 @@ endif
# $(PACKAGE_NAME)-$(BASEVERSION)
$(DIST)
# $(RELEASETAG)
$(DIST)
#
-SPECBUILD:=$(PREBUILD)$(BUILD)$(BUILDID)
+SPECBUILD:=$(PREBUILD)$(BUILD)$(LOCALVERSION)
SPECVERSION:=$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)
BASEVERSION:=$(SPECVERSION)-$(SPECBUILD)
RELEASETAG:=$(PACKAGE_NAME)-$(BASEVERSION)
@@ -573,7 +573,7 @@ dist-all-rpms: dist-sources do-rpmbuild
dist-srpm: RPMBUILDOPTS=--nodeps -bs
dist-srpm: dist-sources do-rpmbuild
-dist-srpm-gcov: BUILDID=".gcov"
+dist-srpm-gcov: LOCALVERSION=".gcov"
dist-srpm-gcov: BUILDOPTS+="+gcov"
dist-srpm-gcov: dist-srpm
@@ -652,7 +652,7 @@ dist-vr-check:
@# version-release string with max 64 chars. The version-release for
s390x+zfcpdump
@# is 29 characters, leaving a maximum of 35 characters for SPECBUILD.
@if [ $$(echo -n $(SPECBUILD) | wc -c) -gt 35 ]; then \
- echo "SPECBUILD ($(SPECBUILD)) is too long. Use a shorter
localversion (currently $(BUILDID))"; \
+ echo "SPECBUILD ($(SPECBUILD)) is too long. Use a shorter
localversion (currently $(LOCALVERSION))"; \
exit 1; \
fi
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757
_______________________________________________
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
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@lists.fedoraproject.org
Do not reply to spam on the list, report it:
https://pagure.io/fedora-infrastructure
