[OS-BUILD PATCHv4 5/17] redhat/Makefile: Rename RPMKPATCHLEVEL to SPECKPATCHLEVEL

Thursday, 5 May 2022

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

redhat/Makefile: Rename RPMKPATCHLEVEL to SPECKPATCHLEVEL

Change RPMKPATCHLEVEL to SPECPATCHLEVEL so that readers understand it is passed
into the spec file.

Rename RPMKPATCHLEVEL to SPECKPATCHLEVEL.

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
@@ -51,7 +51,7 @@ RPMBUILD:=$(shell if [ -x "/usr/bin/rpmbuild" ]; then echo
rpmbuild; \
 
 MACH:=$(shell uname -m)
 SPECKVERSION:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^VERSION\ =\
/{s///;p;q}')
-RPMKPATCHLEVEL:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^PATCHLEVEL\ =\
/{s///;p;q}')
+SPECKPATCHLEVEL:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^PATCHLEVEL\ =\
/{s///;p;q}')
 RPMKSUBLEVEL:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^SUBLEVEL\ =\
/{s///;p;q}')
 RPMKEXTRAVERSION:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^EXTRAVERSION\ =\
/{s///;p;q}')
 GITID:= $(shell $(GIT) log --max-count=1 --pretty=format:%H $(HEAD))
@@ -131,24 +131,24 @@ ifeq ("$(origin O)", "command line")
 endif
 
 # MARKER is the git tag which we base off of for exporting patches
-# Make sure MARKER uses SPECKVERSION, RPMKPATCHLEVEL and RPMKEXTRAVERSION from
-# the kernel makefile as opposed to any adjusted version for snapshotting.
+# Make sure MARKER uses SPECKVERSION, SPECKPATCHLEVEL and RPMKEXTRAVERSION from
+# makefile as opposed to any adjusted version for snapshotting.
 ifneq ($(RPMKEXTRAVERSION),)
-  MARKER:=v$(SPECKVERSION).$(RPMKPATCHLEVEL)$(RPMKEXTRAVERSION)
+  MARKER:=v$(SPECKVERSION).$(SPECKPATCHLEVEL)$(RPMKEXTRAVERSION)
   KEXTRAVERSION:=$(shell echo $(RPMKEXTRAVERSION) | sed -e s/-/./)
   PREBUILD:=0$(KEXTRAVERSION).
-  UPSTREAM_TARBALL_NAME:=$(SPECKVERSION).$(RPMKPATCHLEVEL)$(RPMKEXTRAVERSION)
+  UPSTREAM_TARBALL_NAME:=$(SPECKVERSION).$(SPECKPATCHLEVEL)$(RPMKEXTRAVERSION)
 else
   KEXTRAVERSION:=
   ifeq ($(RPMKSUBLEVEL),0)
-    MARKER:=v$(SPECKVERSION).$(RPMKPATCHLEVEL)
-    UPSTREAM_TARBALL_NAME:=$(SPECKVERSION).$(RPMKPATCHLEVEL)
+    MARKER:=v$(SPECKVERSION).$(SPECKPATCHLEVEL)
+    UPSTREAM_TARBALL_NAME:=$(SPECKVERSION).$(SPECKPATCHLEVEL)
   else
-    # Make sure MARKER uses SPECKVERSION, RPMKPATCHLEVEL, and RPMKSUBLEVEL from
+    # Make sure MARKER uses SPECKVERSION, SPECKPATCHLEVEL, and RPMKSUBLEVEL
     # from the kernel makefile as opposed to any adjusted version for snapshotting.
     # IOW, these variables are *NOT* equivalent to the SPECVERSION variable.
-    MARKER:=v$(SPECKVERSION).$(RPMKPATCHLEVEL).$(RPMKSUBLEVEL)
-    UPSTREAM_TARBALL_NAME:=$(SPECKVERSION).$(RPMKPATCHLEVEL).$(RPMKSUBLEVEL)
+    MARKER:=v$(SPECKVERSION).$(SPECKPATCHLEVEL).$(RPMKSUBLEVEL)
+    UPSTREAM_TARBALL_NAME:=$(SPECKVERSION).$(SPECKPATCHLEVEL).$(RPMKSUBLEVEL)
   endif
   PREBUILD:=
 endif
@@ -185,7 +185,7 @@ ifeq ($(VERSION_ON_UPSTREAM),1)
     ifeq ($(RPMKEXTRAVERSION),)
       KEXTRAVERSION:=.rc0
       PREBUILD:=0$(KEXTRAVERSION).
-      RPMKPATCHLEVEL:=$(shell expr $(RPMKPATCHLEVEL) + 1)
+      SPECKPATCHLEVEL:=$(shell expr $(SPECKPATCHLEVEL) + 1)
     endif
     ifndef PREBUILD_GIT_ONLY
       ifneq ($(filter $(MAKECMDGOALS),dist-git-test dist-git),)
@@ -207,7 +207,7 @@ else
   SNAPSHOT:=0
 endif
 
-SPECVERSION:=$(SPECKVERSION).$(RPMKPATCHLEVEL).$(RPMKSUBLEVEL)
+SPECVERSION:=$(SPECKVERSION).$(SPECKPATCHLEVEL).$(RPMKSUBLEVEL)
 PKGRELEASE:=$(PREBUILD)$(BUILD)$(BUILDID)
 KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(SPECVERSION)-$(PKGRELEASE).tar.bz2
 KABIDW := $(REDHAT)/kabi-dwarf
@@ -495,7 +495,7 @@ sources-rh: $(TARBALL) generate-testpatch-tmp setup-source
dist-configs-check
 	@cp $(TESTPATCH) $(SOURCES)/linux-kernel-test.patch
 	@cat configs/flavors | while read flavor; do echo "Copying sources for
$${flavor}"; [ -e $${flavor}_files ] && cp $${flavor}_files/* $(SOURCES);
done
 	@sed -e "s/%%SPECKVERSION%%/$(SPECKVERSION)/" \
-		-e "s/%%RPMKPATCHLEVEL%%/$(RPMKPATCHLEVEL)/" \
+		-e "s/%%SPECKPATCHLEVEL%%/$(SPECKPATCHLEVEL)/" \
 		rpminspect.yaml > $(SOURCES)/rpminspect.yaml
 	@cp cpupower.* \
 		keys/rhel*.x509 \
diff --git a/redhat/genspec.sh b/redhat/genspec.sh
index blahblah..blahblah 100755
--- a/redhat/genspec.sh
+++ b/redhat/genspec.sh
@@ -59,7 +59,7 @@ test -f "$SOURCES/$SPECFILE" &&
 	sed -i -e "
 	s/%%BUILDID%%/$BUILDID_DEFINE/
 	s/%%SPECKVERSION%%/$SPECKVERSION/
-	s/%%RPMKPATCHLEVEL%%/$RPMKPATCHLEVEL/
+	s/%%SPECKPATCHLEVEL%%/$SPECKPATCHLEVEL/
 	s/%%PKGRELEASE%%/$PKGRELEASE/
 	s/%%SPECRELEASE%%/$SPECRELEASE/
 	s/%%RELEASED_KERNEL%%/$RELEASED_KERNEL/
@@ -93,7 +93,7 @@ fi
 GIT_FORMAT="--format=- %s (%an)%n%N%n^^^NOTES-END^^^%n%b"
 GIT_NOTES="--notes=refs/notes/${RHEL_MAJOR}.${RHEL_MINOR}*"
 
-lasttag=$(git rev-list --first-parent --grep="^\[redhat\]
kernel-${SPECKVERSION}.${RPMKPATCHLEVEL}" --max-count=1 HEAD)
+lasttag=$(git rev-list --first-parent --grep="^\[redhat\]
kernel-${SPECKVERSION}.${SPECKPATCHLEVEL}" --max-count=1 HEAD)
 # if we didn't find the proper tag, assume this is the first release
 if [[ -z $lasttag ]]; then
     if [[ -z ${MARKER//[0-9a-f]/} ]]; then
@@ -174,12 +174,12 @@ if [ "$SINGLE_TARBALL" = 0 ]; then
 	# May need to preserve word splitting in EXCLUDE_FILES
 	# shellcheck disable=SC2086
 	git diff -p --no-renames --stat "$MARKER"..  $EXCLUDE_FILES \
-		> ${SOURCES}/patch-${SPECKVERSION}.${RPMKPATCHLEVEL}-redhat.patch
+		> ${SOURCES}/patch-${SPECKVERSION}.${SPECKPATCHLEVEL}-redhat.patch
 else
 	# The tarball in the SRPM contains both upstream sources and OS-specifc
 	# commits.  Even though this is the case, an empty file for dist-git
 	# compatibility is necessary.
-	touch "${SOURCES}/patch-${SPECKVERSION}.${RPMKPATCHLEVEL}"-redhat.patch
+	touch "${SOURCES}/patch-${SPECKVERSION}.${SPECKPATCHLEVEL}"-redhat.patch
 fi
 
 rm -f "$clogf"{,.stripped};
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
@@ -125,14 +125,14 @@ Summary: The Linux kernel
 %endif
 
 # The kernel tarball/base version
-%define kversion %%SPECKVERSION%%.%%RPMKPATCHLEVEL%%
+%define kversion %%SPECKVERSION%%.%%SPECKPATCHLEVEL%%
 
 %define specversion %%SPECVERSION%%
-%define patchversion %%SPECKVERSION%%.%%RPMKPATCHLEVEL%%
+%define patchversion %%SPECKVERSION%%.%%SPECKPATCHLEVEL%%
 %define pkgrelease %%PKGRELEASE%%
 
 # This is needed to do merge window version magic
-%define patchlevel %%RPMKPATCHLEVEL%%
+%define patchlevel %%SPECKPATCHLEVEL%%
 
 # allow pkg_release to have configurable %%{?dist} tag
 %define specrelease %%SPECRELEASE%%
diff --git a/redhat/rpminspect.yaml b/redhat/rpminspect.yaml
index blahblah..blahblah 100644
--- a/redhat/rpminspect.yaml
+++ b/redhat/rpminspect.yaml
@@ -23,4 +23,4 @@ emptyrpm:
 patches:
     ignore_list:
         - linux-kernel-test.patch
-        - patch-%%SPECKVERSION%%.%%RPMKPATCHLEVEL%%-redhat.patch
+        - patch-%%SPECKVERSION%%.%%SPECKPATCHLEVEL%%-redhat.patch
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
@@ -51,7 +51,6 @@ RHSELFTESTDATA=1
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
 RPMKEXTRAVERSION=-rc5 
-RPMKPATCHLEVEL=16 
 RPMKSUBLEVEL=0 
 RPMVERSION=5.16.0-0.rc5.6.test 
 SHELL=/bin/sh 
@@ -59,6 +58,7 @@ SINGLE_TARBALL=1
 SNAPSHOT=0 
 SOURCES=../redhat/rpm/SOURCES 
 SPECFILE=kernel.spec 
+SPECKPATCHLEVEL=16 
 SPECKVERSION=5 
 SPECRELEASE=0.rc5.6%{?buildid}%{?dist} 
 SPECVERSION=5.16.0 
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
@@ -51,7 +51,6 @@ RHSELFTESTDATA=1
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
 RPMKEXTRAVERSION=-rc5 
-RPMKPATCHLEVEL=16 
 RPMKSUBLEVEL=0 
 RPMVERSION=5.16.0-0.rc5.6.test 
 SHELL=/bin/sh 
@@ -59,6 +58,7 @@ SINGLE_TARBALL=1
 SNAPSHOT=0 
 SOURCES=../redhat/rpm/SOURCES 
 SPECFILE=kernel.spec 
+SPECKPATCHLEVEL=16 
 SPECKVERSION=5 
 SPECRELEASE=0.rc5.6%{?buildid}%{?dist} 
 SPECVERSION=5.16.0 
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
@@ -51,7 +51,6 @@ RHSELFTESTDATA=1
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
 RPMKEXTRAVERSION= 
-RPMKPATCHLEVEL=17 
 RPMKSUBLEVEL=0 
 RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test 
 SHELL=/bin/sh 
@@ -59,6 +58,7 @@ SINGLE_TARBALL=1
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
 SPECFILE=kernel.spec 
+SPECKPATCHLEVEL=17 
 SPECKVERSION=5 
 SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist} 
 SPECVERSION=5.17.0 
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
@@ -51,7 +51,6 @@ RHSELFTESTDATA=1
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
 RPMKEXTRAVERSION= 
-RPMKPATCHLEVEL=17 
 RPMKSUBLEVEL=0 
 RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test 
 SHELL=/bin/sh 
@@ -59,6 +58,7 @@ SINGLE_TARBALL=1
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
 SPECFILE=kernel.spec 
+SPECKPATCHLEVEL=17 
 SPECKVERSION=5 
 SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist} 
 SPECVERSION=5.17.0 
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
@@ -51,7 +51,6 @@ RHSELFTESTDATA=1
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
 RPMKEXTRAVERSION= 
-RPMKPATCHLEVEL=16 
 RPMKSUBLEVEL=0 
 RPMVERSION=5.16.0-6.test 
 SHELL=/bin/sh 
@@ -59,6 +58,7 @@ SINGLE_TARBALL=1
 SNAPSHOT=0 
 SOURCES=../redhat/rpm/SOURCES 
 SPECFILE=kernel.spec 
+SPECKPATCHLEVEL=16 
 SPECKVERSION=5 
 SPECRELEASE=6%{?buildid}%{?dist} 
 SPECVERSION=5.16.0 
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
@@ -51,7 +51,6 @@ RHSELFTESTDATA=1
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
 RPMKEXTRAVERSION= 
-RPMKPATCHLEVEL=16 
 RPMKSUBLEVEL=0 
 RPMVERSION=5.16.0-6.test 
 SHELL=/bin/sh 
@@ -59,6 +58,7 @@ SINGLE_TARBALL=1
 SNAPSHOT=0 
 SOURCES=../redhat/rpm/SOURCES 
 SPECFILE=kernel.spec 
+SPECKPATCHLEVEL=16 
 SPECKVERSION=5 
 SPECRELEASE=6%{?buildid}%{?dist} 
 SPECVERSION=5.16.0 
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
@@ -51,7 +51,6 @@ RHSELFTESTDATA=1
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
 RPMKEXTRAVERSION=-rc5 
-RPMKPATCHLEVEL=16 
 RPMKSUBLEVEL=0 
 RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test 
 SHELL=/bin/sh 
@@ -59,6 +58,7 @@ SINGLE_TARBALL=1
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
 SPECFILE=kernel.spec 
+SPECKPATCHLEVEL=16 
 SPECKVERSION=5 
 SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist} 
 SPECVERSION=5.16.0 
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
@@ -51,7 +51,6 @@ RHSELFTESTDATA=1
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
 RPMKEXTRAVERSION=-rc5 
-RPMKPATCHLEVEL=16 
 RPMKSUBLEVEL=0 
 RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test 
 SHELL=/bin/sh 
@@ -59,6 +58,7 @@ SINGLE_TARBALL=1
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
 SPECFILE=kernel.spec 
+SPECKPATCHLEVEL=16 
 SPECKVERSION=5 
 SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist} 
 SPECVERSION=5.16.0 
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
@@ -49,7 +49,6 @@ RHSELFTESTDATA=1
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
 RPMKEXTRAVERSION=-rc5 
-RPMKPATCHLEVEL=16 
 RPMKSUBLEVEL=0 
 RPMVERSION=5.16.0-0.rc5.6.test 
 SHELL=/bin/sh 
@@ -57,6 +56,7 @@ SINGLE_TARBALL=0
 SNAPSHOT=0 
 SOURCES=../redhat/rpm/SOURCES 
 SPECFILE=kernel.spec 
+SPECKPATCHLEVEL=16 
 SPECKVERSION=5 
 SPECRELEASE=0.rc5.6%{?buildid}%{?dist} 
 SPECVERSION=5.16.0 
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
@@ -49,7 +49,6 @@ RHSELFTESTDATA=1
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
 RPMKEXTRAVERSION=-rc5 
-RPMKPATCHLEVEL=16 
 RPMKSUBLEVEL=0 
 RPMVERSION=5.16.0-0.rc5.6.test 
 SHELL=/bin/sh 
@@ -57,6 +56,7 @@ SINGLE_TARBALL=0
 SNAPSHOT=0 
 SOURCES=../redhat/rpm/SOURCES 
 SPECFILE=kernel.spec 
+SPECKPATCHLEVEL=16 
 SPECKVERSION=5 
 SPECRELEASE=0.rc5.6%{?buildid}%{?dist} 
 SPECVERSION=5.16.0 
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
@@ -49,7 +49,6 @@ RHSELFTESTDATA=1
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
 RPMKEXTRAVERSION= 
-RPMKPATCHLEVEL=17 
 RPMKSUBLEVEL=0 
 RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test 
 SHELL=/bin/sh 
@@ -57,6 +56,7 @@ SINGLE_TARBALL=0
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
 SPECFILE=kernel.spec 
+SPECKPATCHLEVEL=17 
 SPECKVERSION=5 
 SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist} 
 SPECVERSION=5.17.0 
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
@@ -49,7 +49,6 @@ RHSELFTESTDATA=1
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
 RPMKEXTRAVERSION= 
-RPMKPATCHLEVEL=17 
 RPMKSUBLEVEL=0 
 RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test 
 SHELL=/bin/sh 
@@ -57,6 +56,7 @@ SINGLE_TARBALL=0
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
 SPECFILE=kernel.spec 
+SPECKPATCHLEVEL=17 
 SPECKVERSION=5 
 SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist} 
 SPECVERSION=5.17.0 
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
@@ -49,7 +49,6 @@ RHSELFTESTDATA=1
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
 RPMKEXTRAVERSION= 
-RPMKPATCHLEVEL=16 
 RPMKSUBLEVEL=0 
 RPMVERSION=5.16.0-6.test 
 SHELL=/bin/sh 
@@ -57,6 +56,7 @@ SINGLE_TARBALL=0
 SNAPSHOT=0 
 SOURCES=../redhat/rpm/SOURCES 
 SPECFILE=kernel.spec 
+SPECKPATCHLEVEL=16 
 SPECKVERSION=5 
 SPECRELEASE=6%{?buildid}%{?dist} 
 SPECVERSION=5.16.0 
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
@@ -49,7 +49,6 @@ RHSELFTESTDATA=1
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
 RPMKEXTRAVERSION= 
-RPMKPATCHLEVEL=16 
 RPMKSUBLEVEL=0 
 RPMVERSION=5.16.0-6.test 
 SHELL=/bin/sh 
@@ -57,6 +56,7 @@ SINGLE_TARBALL=0
 SNAPSHOT=0 
 SOURCES=../redhat/rpm/SOURCES 
 SPECFILE=kernel.spec 
+SPECKPATCHLEVEL=16 
 SPECKVERSION=5 
 SPECRELEASE=6%{?buildid}%{?dist} 
 SPECVERSION=5.16.0 
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
@@ -49,7 +49,6 @@ RHSELFTESTDATA=1
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
 RPMKEXTRAVERSION=-rc5 
-RPMKPATCHLEVEL=16 
 RPMKSUBLEVEL=0 
 RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test 
 SHELL=/bin/sh 
@@ -57,6 +56,7 @@ SINGLE_TARBALL=0
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
 SPECFILE=kernel.spec 
+SPECKPATCHLEVEL=16 
 SPECKVERSION=5 
 SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist} 
 SPECVERSION=5.16.0 
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
@@ -49,7 +49,6 @@ RHSELFTESTDATA=1
 RPM=../redhat/rpm 
 RPMBUILD=rpmbuild 
 RPMKEXTRAVERSION=-rc5 
-RPMKPATCHLEVEL=16 
 RPMKSUBLEVEL=0 
 RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test 
 SHELL=/bin/sh 
@@ -57,6 +56,7 @@ SINGLE_TARBALL=0
 SNAPSHOT=1 
 SOURCES=../redhat/rpm/SOURCES 
 SPECFILE=kernel.spec 
+SPECKPATCHLEVEL=16 
 SPECKVERSION=5 
 SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist} 
 SPECVERSION=5.16.0 

--
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 PATCHv4 5/17] redhat/Makefile: Rename RPMKPATCHLEVEL to SPECKPATCHLEVEL