From: Prarit Bhargava <prarit@xxxxxxxxxx> redhat/Makefile: Rename RPMKEXTRAVERSION to SPECKEXTRAVERSION Change RPMKEXTRAVERSION to SPECEXTRAVERSION so that readers understand it is passed into the spec file. Rename RPMKEXTRAVERSION to SPECKEXTRAVERSION. Signed-off-by: Prarit Bhargava <prarit@xxxxxxxxxx> diff --git a/redhat/Makefile b/redhat/Makefile index blahblah..blahblah 100644 --- a/redhat/Makefile +++ b/redhat/Makefile @@ -53,7 +53,7 @@ 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}') SPECKSUBLEVEL:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^SUBLEVEL\ =\ /{s///;p;q}') -RPMKEXTRAVERSION:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^EXTRAVERSION\ =\ /{s///;p;q}') +SPECKEXTRAVERSION:=$(shell $(GIT) show $(HEAD):Makefile | sed -ne '/^EXTRAVERSION\ =\ /{s///;p;q}') GITID:= $(shell $(GIT) log --max-count=1 --pretty=format:%H $(HEAD)) ifndef BUILD BUILD:=$(RHEL_RELEASE) @@ -131,20 +131,20 @@ ifeq ("$(origin O)", "command line") endif # MARKER is the git tag which we base off of for exporting patches -# Make sure MARKER uses SPECKVERSION, SPECKPATCHLEVEL and RPMKEXTRAVERSION from -# makefile as opposed to any adjusted version for snapshotting. -ifneq ($(RPMKEXTRAVERSION),) - MARKER:=v$(SPECKVERSION).$(SPECKPATCHLEVEL)$(RPMKEXTRAVERSION) - KEXTRAVERSION:=$(shell echo $(RPMKEXTRAVERSION) | sed -e s/-/./) +# Make sure MARKER uses SPECKVERSION, SPECKPATCHLEVEL and SPECKEXTRAVERSION +# from makefile as opposed to any adjusted version for snapshotting. +ifneq ($(SPECKEXTRAVERSION),) + MARKER:=v$(SPECKVERSION).$(SPECKPATCHLEVEL)$(SPECKEXTRAVERSION) + KEXTRAVERSION:=$(shell echo $(SPECKEXTRAVERSION) | sed -e s/-/./) PREBUILD:=0$(KEXTRAVERSION). - UPSTREAM_TARBALL_NAME:=$(SPECKVERSION).$(SPECKPATCHLEVEL)$(RPMKEXTRAVERSION) + UPSTREAM_TARBALL_NAME:=$(SPECKVERSION).$(SPECKPATCHLEVEL)$(SPECKEXTRAVERSION) else KEXTRAVERSION:= ifeq ($(SPECKSUBLEVEL),0) MARKER:=v$(SPECKVERSION).$(SPECKPATCHLEVEL) UPSTREAM_TARBALL_NAME:=$(SPECKVERSION).$(SPECKPATCHLEVEL) else - # Make sure MARKER uses SPECKVERSION, SPECKPATCHLEVEL, and RPMKSUBLEVEL + # Make sure MARKER uses SPECKVERSION, SPECKPATCHLEVEL, and SPECKSUBLEVEL # 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).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL) @@ -182,7 +182,7 @@ ifeq ($(VERSION_ON_UPSTREAM),1) # been updated but we still need something that works for # packaging. Fix this by bumping the patch level and marking # this as rc0 - ifeq ($(RPMKEXTRAVERSION),) + ifeq ($(SPECKEXTRAVERSION),) KEXTRAVERSION:=.rc0 PREBUILD:=0$(KEXTRAVERSION). SPECKPATCHLEVEL:=$(shell expr $(SPECKPATCHLEVEL) + 1) 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 @@ -50,13 +50,13 @@ RHPKG_BIN=centpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION=-rc5 RPMVERSION=5.16.0-0.rc5.6.test SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 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 @@ -50,13 +50,13 @@ RHPKG_BIN=centpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION=-rc5 RPMVERSION=5.16.0-0.rc5.6.test SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 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 @@ -50,13 +50,13 @@ RHPKG_BIN=centpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION= RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION= SPECKPATCHLEVEL=17 SPECKSUBLEVEL=0 SPECKVERSION=5 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 @@ -50,13 +50,13 @@ RHPKG_BIN=centpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION= RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION= SPECKPATCHLEVEL=17 SPECKSUBLEVEL=0 SPECKVERSION=5 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 @@ -50,13 +50,13 @@ RHPKG_BIN=centpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION= RPMVERSION=5.16.0-6.test SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION= SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 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 @@ -50,13 +50,13 @@ RHPKG_BIN=centpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION= RPMVERSION=5.16.0-6.test SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION= SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 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 @@ -50,13 +50,13 @@ RHPKG_BIN=centpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION=-rc5 RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 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 @@ -50,13 +50,13 @@ RHPKG_BIN=centpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION=-rc5 RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 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 @@ -48,13 +48,13 @@ RHPKG_BIN=fedpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION=-rc5 RPMVERSION=5.16.0-0.rc5.6.test SHELL=/bin/sh SINGLE_TARBALL=0 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 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 @@ -48,13 +48,13 @@ RHPKG_BIN=fedpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION=-rc5 RPMVERSION=5.16.0-0.rc5.6.test SHELL=/bin/sh SINGLE_TARBALL=0 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 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 @@ -48,13 +48,13 @@ RHPKG_BIN=fedpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION= RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test SHELL=/bin/sh SINGLE_TARBALL=0 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION= SPECKPATCHLEVEL=17 SPECKSUBLEVEL=0 SPECKVERSION=5 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 @@ -48,13 +48,13 @@ RHPKG_BIN=fedpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION= RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test SHELL=/bin/sh SINGLE_TARBALL=0 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION= SPECKPATCHLEVEL=17 SPECKSUBLEVEL=0 SPECKVERSION=5 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 @@ -48,13 +48,13 @@ RHPKG_BIN=fedpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION= RPMVERSION=5.16.0-6.test SHELL=/bin/sh SINGLE_TARBALL=0 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION= SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 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 @@ -48,13 +48,13 @@ RHPKG_BIN=fedpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION= RPMVERSION=5.16.0-6.test SHELL=/bin/sh SINGLE_TARBALL=0 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION= SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 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 @@ -48,13 +48,13 @@ RHPKG_BIN=fedpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION=-rc5 RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test SHELL=/bin/sh SINGLE_TARBALL=0 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 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 @@ -48,13 +48,13 @@ RHPKG_BIN=fedpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION=-rc5 RPMVERSION=5.16.0-0.rc5.fce15c45d3fbd9f.6.test SHELL=/bin/sh SINGLE_TARBALL=0 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 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 @@ -48,13 +48,13 @@ RHPKG_BIN=rhpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION=-rc5 RPMVERSION=5.16.0-0.rc5.6.test SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 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 @@ -48,13 +48,13 @@ RHPKG_BIN=rhpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION=-rc5 RPMVERSION=5.16.0-0.rc5.6.test SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=0 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION=-rc5 SPECKPATCHLEVEL=16 SPECKSUBLEVEL=0 SPECKVERSION=5 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 @@ -48,13 +48,13 @@ RHPKG_BIN=rhpkg RHSELFTESTDATA=1 RPM=../redhat/rpm RPMBUILD=rpmbuild -RPMKEXTRAVERSION= RPMVERSION=5.17.0-0.rc0.78e36f3b0dae586.6.test SHELL=/bin/sh SINGLE_TARBALL=1 SNAPSHOT=1 SOURCES=../redhat/rpm/SOURCES SPECFILE=kernel.spec +SPECKEXTRAVERSION= SPECKPATCHLEVEL=17 SPECKSUBLEVEL=0 SPECKVERSION=5 -- https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1727 _______________________________________________ kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx 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@xxxxxxxxxxxxxxxxxxxxxxx Do not reply to spam on the list, report it: https://pagure.io/fedora-infrastructure