[OS-BUILD PATCH 6/18] redhat/Makfile: Rename RPMKSUBLEVEL to SPECKSUBLEVEL

From: Prarit Bhargava <prarit(a)redhat.com&gt; redhat/Makfile: Rename RPMKSUBLEVEL to SPECKSUBLEVEL Change RPMKSUBLEVEL to SPECSUBLEVEL so that readers understand it is passed into the spec file. Rename RPMKSUBLEVEL to SPECKSUBLEVEL. 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 @@ -52,7 +52,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}') SPECKPATCHLEVEL:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^PATCHLEVEL\ =\ /{s///;p;q}') -RPMKSUBLEVEL:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^SUBLEVEL\ =\ /{s///;p;q}') +SPECKSUBLEVEL:=$(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)) ifndef BUILD @@ -140,7 +140,7 @@ ifneq ($(RPMKEXTRAVERSION),) UPSTREAM_TARBALL_NAME:=$(SPECKVERSION).$(SPECKPATCHLEVEL)$(RPMKEXTRAVERSION) else KEXTRAVERSION:= - ifeq ($(RPMKSUBLEVEL),0) + ifeq ($(SPECKSUBLEVEL),0) MARKER:=v$(SPECKVERSION).$(SPECKPATCHLEVEL) UPSTREAM_TARBALL_NAME:=$(SPECKVERSION).$(SPECKPATCHLEVEL) else @@ -204,7 +204,7 @@ else SNAPSHOT:=0 endif -SPECVERSION:=$(SPECKVERSION).$(SPECKPATCHLEVEL).$(RPMKSUBLEVEL) +SPECVERSION:=$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL) DISTRO_BUILD:=$(PREBUILD)$(shell echo $(BUILD) | sed -e 's|\(^[0-9]\{1,4\}\)\..*|\1|') KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(SPECVERSION)-$(DISTRO_BUILD).tar.bz2 KABIDW := $(REDHAT)/kabi-dwarf 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 -RPMKSUBLEVEL=0 RPMVERSION=5.16.0-0.rc5.6.test SHELL=/bin/sh SINGLE_TARBALL=1 @@ -59,6 +58,7 @@ SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec SPECKPATCHLEVEL=16 +SPECKSUBLEVEL=0 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 -RPMKSUBLEVEL=0 RPMVERSION=5.16.0-0.rc5.6.test SHELL=/bin/sh SINGLE_TARBALL=1 @@ -59,6 +58,7 @@ SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec SPECKPATCHLEVEL=16 +SPECKSUBLEVEL=0 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= -RPMKSUBLEVEL=0 RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test SHELL=/bin/sh SINGLE_TARBALL=1 @@ -59,6 +58,7 @@ SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec SPECKPATCHLEVEL=17 +SPECKSUBLEVEL=0 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= -RPMKSUBLEVEL=0 RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test SHELL=/bin/sh SINGLE_TARBALL=1 @@ -59,6 +58,7 @@ SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec SPECKPATCHLEVEL=17 +SPECKSUBLEVEL=0 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= -RPMKSUBLEVEL=0 RPMVERSION=5.16.0-6.test SHELL=/bin/sh SINGLE_TARBALL=1 @@ -59,6 +58,7 @@ SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec SPECKPATCHLEVEL=16 +SPECKSUBLEVEL=0 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= -RPMKSUBLEVEL=0 RPMVERSION=5.16.0-6.test SHELL=/bin/sh SINGLE_TARBALL=1 @@ -59,6 +58,7 @@ SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec SPECKPATCHLEVEL=16 +SPECKSUBLEVEL=0 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 -RPMKSUBLEVEL=0 RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test SHELL=/bin/sh SINGLE_TARBALL=1 @@ -59,6 +58,7 @@ SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec SPECKPATCHLEVEL=16 +SPECKSUBLEVEL=0 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 -RPMKSUBLEVEL=0 RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test SHELL=/bin/sh SINGLE_TARBALL=1 @@ -59,6 +58,7 @@ SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec SPECKPATCHLEVEL=16 +SPECKSUBLEVEL=0 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 -RPMKSUBLEVEL=0 RPMVERSION=5.16.0-0.rc5.6.test SHELL=/bin/sh SINGLE_TARBALL=0 @@ -57,6 +56,7 @@ SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec SPECKPATCHLEVEL=16 +SPECKSUBLEVEL=0 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 -RPMKSUBLEVEL=0 RPMVERSION=5.16.0-0.rc5.6.test SHELL=/bin/sh SINGLE_TARBALL=0 @@ -57,6 +56,7 @@ SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec SPECKPATCHLEVEL=16 +SPECKSUBLEVEL=0 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= -RPMKSUBLEVEL=0 RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test SHELL=/bin/sh SINGLE_TARBALL=0 @@ -57,6 +56,7 @@ SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec SPECKPATCHLEVEL=17 +SPECKSUBLEVEL=0 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= -RPMKSUBLEVEL=0 RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test SHELL=/bin/sh SINGLE_TARBALL=0 @@ -57,6 +56,7 @@ SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec SPECKPATCHLEVEL=17 +SPECKSUBLEVEL=0 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= -RPMKSUBLEVEL=0 RPMVERSION=5.16.0-6.test SHELL=/bin/sh SINGLE_TARBALL=0 @@ -57,6 +56,7 @@ SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec SPECKPATCHLEVEL=16 +SPECKSUBLEVEL=0 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= -RPMKSUBLEVEL=0 RPMVERSION=5.16.0-6.test SHELL=/bin/sh SINGLE_TARBALL=0 @@ -57,6 +56,7 @@ SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec SPECKPATCHLEVEL=16 +SPECKSUBLEVEL=0 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 -RPMKSUBLEVEL=0 RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test SHELL=/bin/sh SINGLE_TARBALL=0 @@ -57,6 +56,7 @@ SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec SPECKPATCHLEVEL=16 +SPECKSUBLEVEL=0 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 -RPMKSUBLEVEL=0 RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test SHELL=/bin/sh SINGLE_TARBALL=0 @@ -57,6 +56,7 @@ SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec SPECKPATCHLEVEL=16 +SPECKSUBLEVEL=0 SPECKVERSION=5 SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist} SPECVERSION=5.16.0 diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.el7 b/redhat/self-test/data/rhel-2585cf9dfaad.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/rhel-2585cf9dfaad.el7 +++ b/redhat/self-test/data/rhel-2585cf9dfaad.el7 @@ -49,7 +49,6 @@ RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild RPMKEXTRAVERSION=-rc5 -RPMKSUBLEVEL=0 RPMVERSION=5.16.0-0.rc5.6.test SHELL=/bin/sh SINGLE_TARBALL=1 @@ -57,6 +56,7 @@ SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec SPECKPATCHLEVEL=16 +SPECKSUBLEVEL=0 SPECKVERSION=5 SPECRELEASE=0.rc5.6%{?buildid}%{?dist} SPECVERSION=5.16.0 diff --git a/redhat/self-test/data/rhel-2585cf9dfaad.fc25 b/redhat/self-test/data/rhel-2585cf9dfaad.fc25 index blahblah..blahblah 100644 --- a/redhat/self-test/data/rhel-2585cf9dfaad.fc25 +++ b/redhat/self-test/data/rhel-2585cf9dfaad.fc25 @@ -49,7 +49,6 @@ RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild RPMKEXTRAVERSION=-rc5 -RPMKSUBLEVEL=0 RPMVERSION=5.16.0-0.rc5.6.test SHELL=/bin/sh SINGLE_TARBALL=1 @@ -57,6 +56,7 @@ SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec SPECKPATCHLEVEL=16 +SPECKSUBLEVEL=0 SPECKVERSION=5 SPECRELEASE=0.rc5.6%{?buildid}%{?dist} SPECVERSION=5.16.0 diff --git a/redhat/self-test/data/rhel-78e36f3b0dae.el7 b/redhat/self-test/data/rhel-78e36f3b0dae.el7 index blahblah..blahblah 100644 --- a/redhat/self-test/data/rhel-78e36f3b0dae.el7 +++ b/redhat/self-test/data/rhel-78e36f3b0dae.el7 @@ -49,7 +49,6 @@ RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild RPMKEXTRAVERSION= -RPMKSUBLEVEL=0 RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test SHELL=/bin/sh SINGLE_TARBALL=1 @@ -57,6 +56,7 @@ SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec SPECKPATCHLEVEL=17 +SPECKSUBLEVEL=0 SPECKVERSION=5 SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist} SPECVERSION=5.17.0 -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1728