[OS-BUILD PATCHv3 15/17] redhat/Makefile: Rename BUILDID to LOCALVERSION

[Prarit Bhargava (via Email Bridge)]

From: Prarit Bhargava <prarit(a)redhat.com&gt;

redhat/Makefile: Rename BUILDID to LOCALVERSION

BUILDID isn't a very descriptive name.  Rename the variable to
LOCALVERSION.

Signed-off-by: Prarit Bhargava <prarit(a)redhat.com&gt;

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
 
diff --git a/redhat/genspec.sh b/redhat/genspec.sh
index blahblah..blahblah 100755
--- a/redhat/genspec.sh
+++ b/redhat/genspec.sh
@@ -23,8 +23,8 @@ else
 	SPECDEBUG_BUILDS_ENABLED=0
 fi
 
-if [ -n "$BUILDID" ]; then
-	SPECBUILDID=$(printf "%%define buildid %s" "$BUILDID")
+if [ -n "$LOCALVERSION" ]; then
+	SPECBUILDID=$(printf "%%define buildid %s" "$LOCALVERSION")
 else
 	SPECBUILDID="# define buildid .local"
 fi

--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1757