[OS-BUILD PATCHv3 10/17] redhat/Makefile: Rename PKGRELEASE to SPECBUILD

Wednesday, 4 May 2022

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

redhat/Makefile: Rename PKGRELEASE to SPECBUILD

PKGRELEASE is a confusing variable name, and it really is the BUILD string
for the specfile.

Rename PKGRELEASE to SPECBUILD.

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
@@ -208,11 +208,11 @@ else
 endif
 
 SPECVERSION:=$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)
-PKGRELEASE:=$(PREBUILD)$(BUILD)$(BUILDID)
-KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(SPECVERSION)-$(PKGRELEASE).tar.bz2
+SPECBUILD:=$(PREBUILD)$(BUILD)$(BUILDID)
+KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(SPECVERSION)-$(SPECBUILD).tar.bz2
 KABIDW := $(REDHAT)/kabi-dwarf
-KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(SPECVERSION)-$(PKGRELEASE).tar.bz2
-RPMVERSION:=$(SPECVERSION)-$(PKGRELEASE)
+KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(SPECVERSION)-$(SPECBUILD).tar.bz2
+RPMVERSION:=$(SPECVERSION)-$(SPECBUILD)
 SPECRELEASE:=$(PREBUILD)$(BUILD)%{?buildid}%{?dist}
 SRPM:=$(SRPMS)/$(PACKAGE_NAME)-$(RPMVERSION)$(DIST).src.rpm
 
@@ -427,12 +427,12 @@ dist-tarball: $(TARBALL)
 dist-kernelrelease:
 	# deprecated at 5.17.0
 	@echo "WARNING: This target will be deprecated in a future release."
-	@echo $(PACKAGE_NAME)-$(SPECVERSION)-$(PKGRELEASE)
+	@echo $(PACKAGE_NAME)-$(SPECVERSION)-$(SPECBUILD)
 
 dist-kernelversion:
 	# deprecated at 5.17.0
 	@echo "WARNING: This target will be deprecated in a future release."
-	@echo $(SPECVERSION)-$(PKGRELEASE)
+	@echo $(SPECVERSION)-$(SPECBUILD)
 
 dist-specfile: setup-source
 	# deprecated at 5.17.0
@@ -622,9 +622,9 @@ dist-fedora-release-push: dist-fedora-release
 dist-vr-check:
 	@# builds may include a s390x+zfcpdump arch build.  UTS_RELEASE can only have a
 	@# version-release string with max 64 chars.  The version-release for s390x+zfcpdump
-	@# is 29 characters, leaving a maximum of 35 characters for PKGRELEASE.
-	@if [ $$(echo -n $(PKGRELEASE) | wc -c) -gt 35 ]; then \
-		echo "PKGRELEASE ($(PKGRELEASE)) is too long.  Use a shorter localversion
(currently $(BUILDID))"; \
+	@# 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))"; \
 		exit 1; \
 	fi
 
diff --git a/redhat/Makefile.variables b/redhat/Makefile.variables
index blahblah..blahblah 100644
--- a/redhat/Makefile.variables
+++ b/redhat/Makefile.variables
@@ -100,7 +100,7 @@ BUILD ?=
 
 # Builds may include a s390x+zfcpdump arch build, which results in the build
 # failing because the UTS_RELEASE field exceeded 64 chars.  This variable can
-# be set to 1 to decrease the kernel UTS_RELEASE and PKGRELEASE by 11 characters
+# be set to 1 to decrease the kernel UTS_RELEASE and SPECBUILD by 11 characters
 # (YYYYMMDDgit).
 PREBUILD_GIT_ONLY ?=
 
diff --git a/redhat/genspec.sh b/redhat/genspec.sh
index blahblah..blahblah 100755
--- a/redhat/genspec.sh
+++ b/redhat/genspec.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+# shellcheck disable=SC2153
 
 LAST_MARKER=$(cat "${REDHAT}"/marker)
 clogf="$SOURCES/changelog"
@@ -60,7 +61,7 @@ test -f "$SOURCES/$SPECFILE" &&
 	s/%%SPECBUILDID%%/$SPECBUILDID/
 	s/%%SPECKVERSION%%/$SPECKVERSION/
 	s/%%SPECKPATCHLEVEL%%/$SPECKPATCHLEVEL/
-	s/%%PKGRELEASE%%/$PKGRELEASE/
+	s/%%SPECBUILD%%/$SPECBUILD/
 	s/%%SPECRELEASE%%/$SPECRELEASE/
 	s/%%RELEASED_KERNEL%%/$RELEASED_KERNEL/
 	s/%%DEBUG_BUILDS_ENABLED%%/$DEBUG_BUILDS_ENABLED/
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100755
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -129,7 +129,7 @@ Summary: The Linux kernel
 
 %define specversion %%SPECVERSION%%
 %define patchversion %%SPECKVERSION%%.%%SPECKPATCHLEVEL%%
-%define pkgrelease %%PKGRELEASE%%
+%define pkgrelease %%SPECBUILD%%
 
 # This is needed to do merge window version magic
 %define patchlevel %%SPECKPATCHLEVEL%%
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7
b/redhat/self-test/data/centos-2585cf9dfaad.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-2585cf9dfaad.el7
+++ b/redhat/self-test/data/centos-2585cf9dfaad.el7
@@ -33,7 +33,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
 MAKEFLAGS=w -- HEAD=2585cf9dfaad DISTRO=centos DIST=.el7 RHSELFTESTDATA=1 
 MARKER=v5.16-rc5 
 MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c 
-PKGRELEASE=0.rc5.6.test 
 PREBUILD=0.rc5. 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
@@ -54,6 +53,7 @@ SHELL=/bin/sh
 SINGLE_TARBALL=1 
 SNAPSHOT=0 
 SOURCES=../redhat/rpm/SOURCES 
+SPECBUILD=0.rc5.6.test 
 SPECCHANGELOG=kernel.changelog-9.99 
 SPECFILE=kernel.spec 
 SPECKEXTRAVERSION=-rc5 
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25
b/redhat/self-test/data/centos-2585cf9dfaad.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-2585cf9dfaad.fc25
+++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25
@@ -33,7 +33,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
 MAKEFLAGS=w -- HEAD=2585cf9dfaad DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1 
 MARKER=v5.16-rc5 
 MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c 
-PKGRELEASE=0.rc5.6.test 
 PREBUILD=0.rc5. 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
@@ -54,6 +53,7 @@ SHELL=/bin/sh
 SINGLE_TARBALL=1 
 SNAPSHOT=0 
 SOURCES=../redhat/rpm/SOURCES 
+SPECBUILD=0.rc5.6.test 
 SPECCHANGELOG=kernel.changelog-9.99 
 SPECFILE=kernel.spec 
 SPECKEXTRAVERSION=-rc5 
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7
b/redhat/self-test/data/centos-78e36f3b0dae.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-78e36f3b0dae.el7
+++ b/redhat/self-test/data/centos-78e36f3b0dae.el7
@@ -33,7 +33,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
 MAKEFLAGS=w -- HEAD=78e36f3b0dae DISTRO=centos DIST=.el7 RHSELFTESTDATA=1 
 MARKER=78e36f3b0dae586 
 MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
-PKGRELEASE=0.rc0.78e36f3b0dae586.6.test 
 PREBUILD=0.rc0.78e36f3b0dae586. 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
@@ -54,6 +53,7 @@ SHELL=/bin/sh
 SINGLE_TARBALL=1 
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
+SPECBUILD=0.rc0.78e36f3b0dae586.6.test 
 SPECCHANGELOG=kernel.changelog-9.99 
 SPECFILE=kernel.spec 
 SPECKEXTRAVERSION= 
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25
b/redhat/self-test/data/centos-78e36f3b0dae.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-78e36f3b0dae.fc25
+++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25
@@ -33,7 +33,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
 MAKEFLAGS=w -- HEAD=78e36f3b0dae DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1 
 MARKER=78e36f3b0dae586 
 MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
-PKGRELEASE=0.rc0.78e36f3b0dae586.6.test 
 PREBUILD=0.rc0.78e36f3b0dae586. 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
@@ -54,6 +53,7 @@ SHELL=/bin/sh
 SINGLE_TARBALL=1 
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
+SPECBUILD=0.rc0.78e36f3b0dae586.6.test 
 SPECCHANGELOG=kernel.changelog-9.99 
 SPECFILE=kernel.spec 
 SPECKEXTRAVERSION= 
diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7
b/redhat/self-test/data/centos-df0cc57e057f.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-df0cc57e057f.el7
+++ b/redhat/self-test/data/centos-df0cc57e057f.el7
@@ -33,7 +33,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
 MAKEFLAGS=w -- HEAD=df0cc57e057f DISTRO=centos DIST=.el7 RHSELFTESTDATA=1 
 MARKER=v5.16 
 MERGE_BASE=df0cc57e057f18e44dac8e6c18aba47ab53202f9 
-PKGRELEASE=6.test 
 PREBUILD= 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
@@ -54,6 +53,7 @@ SHELL=/bin/sh
 SINGLE_TARBALL=1 
 SNAPSHOT=0 
 SOURCES=../redhat/rpm/SOURCES 
+SPECBUILD=6.test 
 SPECCHANGELOG=kernel.changelog-9.99 
 SPECFILE=kernel.spec 
 SPECKEXTRAVERSION= 
diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25
b/redhat/self-test/data/centos-df0cc57e057f.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-df0cc57e057f.fc25
+++ b/redhat/self-test/data/centos-df0cc57e057f.fc25
@@ -33,7 +33,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
 MAKEFLAGS=w -- HEAD=df0cc57e057f DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1 
 MARKER=v5.16 
 MERGE_BASE=df0cc57e057f18e44dac8e6c18aba47ab53202f9 
-PKGRELEASE=6.test 
 PREBUILD= 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
@@ -54,6 +53,7 @@ SHELL=/bin/sh
 SINGLE_TARBALL=1 
 SNAPSHOT=0 
 SOURCES=../redhat/rpm/SOURCES 
+SPECBUILD=6.test 
 SPECCHANGELOG=kernel.changelog-9.99 
 SPECFILE=kernel.spec 
 SPECKEXTRAVERSION= 
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7
b/redhat/self-test/data/centos-fce15c45d3fb.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-fce15c45d3fb.el7
+++ b/redhat/self-test/data/centos-fce15c45d3fb.el7
@@ -33,7 +33,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
 MAKEFLAGS=w -- HEAD=fce15c45d3fb DISTRO=centos DIST=.el7 RHSELFTESTDATA=1 
 MARKER=fce15c45d3fbd9f 
 MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a 
-PKGRELEASE=0.rc5.fce15c45d3fbd9f.6.test 
 PREBUILD=0.rc5.fce15c45d3fbd9f. 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
@@ -54,6 +53,7 @@ SHELL=/bin/sh
 SINGLE_TARBALL=1 
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
+SPECBUILD=0.rc5.fce15c45d3fbd9f.6.test 
 SPECCHANGELOG=kernel.changelog-9.99 
 SPECFILE=kernel.spec 
 SPECKEXTRAVERSION=-rc5 
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25
b/redhat/self-test/data/centos-fce15c45d3fb.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/centos-fce15c45d3fb.fc25
+++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25
@@ -33,7 +33,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
 MAKEFLAGS=w -- HEAD=fce15c45d3fb DISTRO=centos DIST=.fc25 RHSELFTESTDATA=1 
 MARKER=fce15c45d3fbd9f 
 MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a 
-PKGRELEASE=0.rc5.fce15c45d3fbd9f.6.test 
 PREBUILD=0.rc5.fce15c45d3fbd9f. 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
@@ -54,6 +53,7 @@ SHELL=/bin/sh
 SINGLE_TARBALL=1 
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
+SPECBUILD=0.rc5.fce15c45d3fbd9f.6.test 
 SPECCHANGELOG=kernel.changelog-9.99 
 SPECFILE=kernel.spec 
 SPECKEXTRAVERSION=-rc5 
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.el7
b/redhat/self-test/data/fedora-2585cf9dfaad.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-2585cf9dfaad.el7
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.el7
@@ -31,7 +31,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
 MAKEFLAGS=w -- HEAD=2585cf9dfaad DISTRO=fedora DIST=.el7 RHSELFTESTDATA=1 
 MARKER=v5.16-rc5 
 MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c 
-PKGRELEASE=0.rc5.6.test 
 PREBUILD=0.rc5. 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
@@ -52,6 +51,7 @@ SHELL=/bin/sh
 SINGLE_TARBALL=0 
 SNAPSHOT=0 
 SOURCES=../redhat/rpm/SOURCES 
+SPECBUILD=0.rc5.6.test 
 SPECCHANGELOG=kernel.changelog-9.99 
 SPECFILE=kernel.spec 
 SPECKEXTRAVERSION=-rc5 
diff --git a/redhat/self-test/data/fedora-2585cf9dfaad.fc25
b/redhat/self-test/data/fedora-2585cf9dfaad.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-2585cf9dfaad.fc25
+++ b/redhat/self-test/data/fedora-2585cf9dfaad.fc25
@@ -31,7 +31,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
 MAKEFLAGS=w -- HEAD=2585cf9dfaad DISTRO=fedora DIST=.fc25 RHSELFTESTDATA=1 
 MARKER=v5.16-rc5 
 MERGE_BASE=2585cf9dfaaddf00b069673f27bb3f8530e2039c 
-PKGRELEASE=0.rc5.6.test 
 PREBUILD=0.rc5. 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
@@ -52,6 +51,7 @@ SHELL=/bin/sh
 SINGLE_TARBALL=0 
 SNAPSHOT=0 
 SOURCES=../redhat/rpm/SOURCES 
+SPECBUILD=0.rc5.6.test 
 SPECCHANGELOG=kernel.changelog-9.99 
 SPECFILE=kernel.spec 
 SPECKEXTRAVERSION=-rc5 
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.el7
b/redhat/self-test/data/fedora-78e36f3b0dae.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-78e36f3b0dae.el7
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.el7
@@ -31,7 +31,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
 MAKEFLAGS=w -- HEAD=78e36f3b0dae DISTRO=fedora DIST=.el7 RHSELFTESTDATA=1 
 MARKER=78e36f3b0dae586 
 MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
-PKGRELEASE=0.rc0.78e36f3b0dae586.6.test 
 PREBUILD=0.rc0.78e36f3b0dae586. 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
@@ -52,6 +51,7 @@ SHELL=/bin/sh
 SINGLE_TARBALL=0 
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
+SPECBUILD=0.rc0.78e36f3b0dae586.6.test 
 SPECCHANGELOG=kernel.changelog-9.99 
 SPECFILE=kernel.spec 
 SPECKEXTRAVERSION= 
diff --git a/redhat/self-test/data/fedora-78e36f3b0dae.fc25
b/redhat/self-test/data/fedora-78e36f3b0dae.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-78e36f3b0dae.fc25
+++ b/redhat/self-test/data/fedora-78e36f3b0dae.fc25
@@ -31,7 +31,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
 MAKEFLAGS=w -- HEAD=78e36f3b0dae DISTRO=fedora DIST=.fc25 RHSELFTESTDATA=1 
 MARKER=78e36f3b0dae586 
 MERGE_BASE=78e36f3b0dae586f623c4a37ec5eb5496f5abbe1 
-PKGRELEASE=0.rc0.78e36f3b0dae586.6.test 
 PREBUILD=0.rc0.78e36f3b0dae586. 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
@@ -52,6 +51,7 @@ SHELL=/bin/sh
 SINGLE_TARBALL=0 
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
+SPECBUILD=0.rc0.78e36f3b0dae586.6.test 
 SPECCHANGELOG=kernel.changelog-9.99 
 SPECFILE=kernel.spec 
 SPECKEXTRAVERSION= 
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.el7
b/redhat/self-test/data/fedora-df0cc57e057f.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-df0cc57e057f.el7
+++ b/redhat/self-test/data/fedora-df0cc57e057f.el7
@@ -31,7 +31,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
 MAKEFLAGS=w -- HEAD=df0cc57e057f DISTRO=fedora DIST=.el7 RHSELFTESTDATA=1 
 MARKER=v5.16 
 MERGE_BASE=df0cc57e057f18e44dac8e6c18aba47ab53202f9 
-PKGRELEASE=6.test 
 PREBUILD= 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
@@ -52,6 +51,7 @@ SHELL=/bin/sh
 SINGLE_TARBALL=0 
 SNAPSHOT=0 
 SOURCES=../redhat/rpm/SOURCES 
+SPECBUILD=6.test 
 SPECCHANGELOG=kernel.changelog-9.99 
 SPECFILE=kernel.spec 
 SPECKEXTRAVERSION= 
diff --git a/redhat/self-test/data/fedora-df0cc57e057f.fc25
b/redhat/self-test/data/fedora-df0cc57e057f.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-df0cc57e057f.fc25
+++ b/redhat/self-test/data/fedora-df0cc57e057f.fc25
@@ -31,7 +31,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
 MAKEFLAGS=w -- HEAD=df0cc57e057f DISTRO=fedora DIST=.fc25 RHSELFTESTDATA=1 
 MARKER=v5.16 
 MERGE_BASE=df0cc57e057f18e44dac8e6c18aba47ab53202f9 
-PKGRELEASE=6.test 
 PREBUILD= 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
@@ -52,6 +51,7 @@ SHELL=/bin/sh
 SINGLE_TARBALL=0 
 SNAPSHOT=0 
 SOURCES=../redhat/rpm/SOURCES 
+SPECBUILD=6.test 
 SPECCHANGELOG=kernel.changelog-9.99 
 SPECFILE=kernel.spec 
 SPECKEXTRAVERSION= 
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.el7
b/redhat/self-test/data/fedora-fce15c45d3fb.el7
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-fce15c45d3fb.el7
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.el7
@@ -31,7 +31,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
 MAKEFLAGS=w -- HEAD=fce15c45d3fb DISTRO=fedora DIST=.el7 RHSELFTESTDATA=1 
 MARKER=fce15c45d3fbd9f 
 MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a 
-PKGRELEASE=0.rc5.fce15c45d3fbd9f.6.test 
 PREBUILD=0.rc5.fce15c45d3fbd9f. 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
@@ -52,6 +51,7 @@ SHELL=/bin/sh
 SINGLE_TARBALL=0 
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
+SPECBUILD=0.rc5.fce15c45d3fbd9f.6.test 
 SPECCHANGELOG=kernel.changelog-9.99 
 SPECFILE=kernel.spec 
 SPECKEXTRAVERSION=-rc5 
diff --git a/redhat/self-test/data/fedora-fce15c45d3fb.fc25
b/redhat/self-test/data/fedora-fce15c45d3fb.fc25
index blahblah..blahblah 100644
--- a/redhat/self-test/data/fedora-fce15c45d3fb.fc25
+++ b/redhat/self-test/data/fedora-fce15c45d3fb.fc25
@@ -31,7 +31,6 @@ MAKEFILE_LIST=Makefile Makefile.variables ../Makefile.rhelver
Makefile.rhpkg Mak
 MAKEFLAGS=w -- HEAD=fce15c45d3fb DISTRO=fedora DIST=.fc25 RHSELFTESTDATA=1 
 MARKER=fce15c45d3fbd9f 
 MERGE_BASE=fce15c45d3fbd9fc1feaaf3210d8e3f8b33dfd3a 
-PKGRELEASE=0.rc5.fce15c45d3fbd9f.6.test 
 PREBUILD=0.rc5.fce15c45d3fbd9f. 
 PROCESS_CONFIGS_CHECK_OPTS=-n -t -c 
 PROCESS_CONFIGS_OPTS=-n -w -c 
@@ -52,6 +51,7 @@ SHELL=/bin/sh
 SINGLE_TARBALL=0 
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
+SPECBUILD=0.rc5.fce15c45d3fbd9f.6.test 
 SPECCHANGELOG=kernel.changelog-9.99 
 SPECFILE=kernel.spec 
 SPECKEXTRAVERSION=-rc5 

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

    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

[OS-BUILD PATCHv3 10/17] redhat/Makefile: Rename PKGRELEASE to SPECBUILD