From: Jan Stancek <jstancek@xxxxxxxxxx>
redhat: separate RPM version from uname version
This defines new variables, which allow for RPMs and configs to have
version and release, which is not tied to (upstream) kernel uname version.
For ARK/Fedora/ELN both remain identical - matching kernel uname.
Signed-off-by: Jan Stancek <jstancek@xxxxxxxxxx>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -218,13 +218,14 @@ endif
# This can be evaluated as
#
# $(SPECPACKAGE_NAME)-$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)-$(SPECBUILD) $(DIST)
-# $(SPECPACKAGE_NAME)-$(SPECVERSION) -$(SPECBUILD) $(DIST)
+# $(SPECPACKAGE_NAME)-$(SPECRPMVERSION) -$(SPECBUILD) $(DIST)
# $(SPECPACKAGE_NAME)-$(BASEVERSION) $(DIST)
# $(RELEASETAG) $(DIST)
#
SPECBUILD:=$(UPSTREAMBUILD)$(BUILD)$(DISTLOCALVERSION)
SPECVERSION:=$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)
-BASEVERSION:=$(SPECVERSION)-$(SPECBUILD)
+SPECRPMVERSION:=$(SPECKVERSION).$(SPECKPATCHLEVEL).$(SPECKSUBLEVEL)
+BASEVERSION:=$(SPECRPMVERSION)-$(SPECBUILD)
RELEASETAG:=$(SPECPACKAGE_NAME)-$(BASEVERSION)
SRPM:=$(SRPMS)/$(RELEASETAG)$(DIST).src.rpm
@@ -241,7 +242,7 @@ ifeq ("$(DISTRO)", "fedora")
# replace the tarball from one with upstream, rebuild, and then deploy
# without changing anything else in the specfile.
SPECTARFILE_RELEASE:=$(UPSTREAM_TARBALL_NAME)
- SPECKABIVERSION:=$(SPECVERSION)
+ SPECKABIVERSION:=$(SPECRPMVERSION)
DISTRELEASETAG:=$(RELEASETAG)
DISTBASEVERSION:=$(BASEVERSION)
RHPKG_BIN:=fedpkg
@@ -503,11 +504,11 @@ dist-kabi-dw-check: dist-kabi
dist-configs-commit: dist-configs-prep
+@cd $(REDHAT)/configs; ./generate_all_configs.sh 1;\
- ./process_configs.sh -z "$(SPECVERSION)" "$(FLAVOR)"
+ ./process_configs.sh -z "$(SPECRPMVERSION)" "$(FLAVOR)"
dist-configs: dist-configs-prep
+@cd $(REDHAT)/configs; ./generate_all_configs.sh 1;\
- ./process_configs.sh $(PROCESS_CONFIGS_OPTS) "$(SPECVERSION)" ""
+ ./process_configs.sh $(PROCESS_CONFIGS_OPTS) "$(SPECRPMVERSION)" ""
dist-fedora-configs: FLAVOR = fedora
dist-fedora-configs: dist-configs
diff --git a/redhat/configs/generate_all_configs.sh b/redhat/configs/generate_all_configs.sh
index blahblah..blahblah 100755
--- a/redhat/configs/generate_all_configs.sh
+++ b/redhat/configs/generate_all_configs.sh
@@ -22,7 +22,7 @@ fi
# The +1 is to remove the - at the end of the SPECPACKAGE_NAME string
specpackage_name_len=$((${#SPECPACKAGE_NAME} + 1))
for i in ${SPECPACKAGE_NAME}*-"$FLAVOR".config; do
- NEW=${SPECPACKAGE_NAME}-"$SPECVERSION"-$(echo ${i:$specpackage_name_len} | sed s/-"$FLAVOR"//)
+ NEW=${SPECPACKAGE_NAME}-"$SPECRPMVERSION"-$(echo ${i:$specpackage_name_len} | sed s/-"$FLAVOR"//)
mv "$i" "$NEW"
done
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -141,6 +141,7 @@ Summary: The Linux kernel
# the --with-release option overrides this setting.)
%define debugbuildsenabled 1
%%SPECBUILDID%%
+%define specrpmversion %%SPECRPMVERSION%%
%define specversion %%SPECVERSION%%
%define patchversion %%SPECKVERSION%%.%%SPECKPATCHLEVEL%%
%define pkgrelease %%SPECBUILD%%
@@ -318,7 +319,7 @@ Summary: The Linux kernel
%define make_target bzImage
%define image_install_path boot
-%define KVERREL %{version}-%{release}.%{_target_cpu}
+%define KVERREL %{specversion}-%{release}.%{_target_cpu}
%define KVERREL_RE %(echo %KVERREL | sed 's/+/[+]/g')
%define hdrarch %_target_cpu
%define asmarch %_target_cpu
@@ -427,7 +428,7 @@ Summary: The Linux kernel
%define with_bpftool 0
%define with_selftests 0
%define with_debug 0
-%define all_arch_configs %{name}-%{version}-*.config
+%define all_arch_configs %{name}-%{specrpmversion}-*.config
%endif
# sparse blows up on ppc
@@ -450,13 +451,13 @@ Summary: The Linux kernel
%ifarch i686
%define asmarch x86
%define hdrarch i386
-%define all_arch_configs %{name}-%{version}-i?86*.config
+%define all_arch_configs %{name}-%{specrpmversion}-i?86*.config
%define kernel_image arch/x86/boot/bzImage
%endif
%ifarch x86_64
%define asmarch x86
-%define all_arch_configs %{name}-%{version}-x86_64*.config
+%define all_arch_configs %{name}-%{specrpmversion}-x86_64*.config
%define kernel_image arch/x86/boot/bzImage
%endif
@@ -467,19 +468,19 @@ Summary: The Linux kernel
%define kernel_image vmlinux
%define kernel_image_elf 1
%define use_vdso 0
-%define all_arch_configs %{name}-%{version}-ppc64le*.config
+%define all_arch_configs %{name}-%{specrpmversion}-ppc64le*.config
%endif
%ifarch s390x
%define asmarch s390
%define hdrarch s390
-%define all_arch_configs %{name}-%{version}-s390x.config
+%define all_arch_configs %{name}-%{specrpmversion}-s390x.config
%define kernel_image arch/s390/boot/bzImage
%define vmlinux_decompressor arch/s390/boot/vmlinux
%endif
%ifarch %{arm}
-%define all_arch_configs %{name}-%{version}-arm*.config
+%define all_arch_configs %{name}-%{specrpmversion}-arm*.config
%define skip_nonpae_vdso 1
%define asmarch arm
%define hdrarch arm
@@ -498,7 +499,7 @@ Summary: The Linux kernel
%endif
%ifarch aarch64
-%define all_arch_configs %{name}-%{version}-aarch64*.config
+%define all_arch_configs %{name}-%{specrpmversion}-aarch64*.config
%define asmarch arm64
%define hdrarch arm64
%define make_target vmlinuz.efi
@@ -581,7 +582,7 @@ Summary: The Linux kernel
Name: %{package_name}
License: GPLv2 and Redistributable, no modification permitted
URL: https://www.kernel.org/
-Version: %{specversion}
+Version: %{specrpmversion}
Release: %{pkg_release}
# DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN ARCHITECTURE BUILD.
# SET %%nobuildarches (ABOVE) INSTEAD
@@ -924,7 +925,7 @@ The kernel meta package
%if %{-o:0}%{!-o:1}\
Provides: kernel = %{specversion}-%{pkg_release}\
%endif\
-Provides: kernel-%{_target_cpu} = %{specversion}-%{pkg_release}%{?1:+%{1}}\
+Provides: kernel-%{_target_cpu} = %{specrpmversion}-%{pkg_release}%{?1:+%{1}}\
Provides: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\
Requires(pre): %{kernel_prereq}\
@@ -996,7 +997,7 @@ of the Linux kernel.
%package -n perf-debuginfo
Summary: Debug information for package perf
-Requires: %{name}-debuginfo-common-%{_target_cpu} = %{version}-%{release}
+Requires: %{name}-debuginfo-common-%{_target_cpu} = %{specrpmversion}-%{release}
AutoReqProv: no
%description -n perf-debuginfo
This package provides debug information for the perf package.
@@ -1016,7 +1017,7 @@ to manipulate perf events.
%package -n python3-perf-debuginfo
Summary: Debug information for package perf python bindings
-Requires: %{name}-debuginfo-common-%{_target_cpu} = %{version}-%{release}
+Requires: %{name}-debuginfo-common-%{_target_cpu} = %{specrpmversion}-%{release}
AutoReqProv: no
%description -n python3-perf-debuginfo
This package provides debug information for the perf python bindings.
@@ -1039,7 +1040,7 @@ Provides: cpufrequtils = 1:009-0.6.p1
Obsoletes: cpufreq-utils < 1:009-0.6.p1
Obsoletes: cpufrequtils < 1:009-0.6.p1
Obsoletes: cpuspeed < 1:1.5-16
-Requires: %{package_name}-tools-libs = %{version}-%{release}
+Requires: %{package_name}-tools-libs = %{specrpmversion}-%{release}
%endif
%define __requires_exclude ^%{_bindir}/python
%description -n %{package_name}-tools
@@ -1108,7 +1109,7 @@ manipulation of eBPF programs and maps.
Summary: Debug information for package bpftool
Version: %{bpftoolversion}
Group: Development/Debug
-Requires: %{name}-debuginfo-common-%{_target_cpu} = %{specversion}-%{release}
+Requires: %{name}-debuginfo-common-%{_target_cpu} = %{specrpmversion}-%{release}
AutoReqProv: no
%description -n bpftool-debuginfo
This package provides debug information for the bpftool package.
@@ -1117,7 +1118,7 @@ This package provides debug information for the bpftool package.
# Setting "Version:" above overrides the internal {version} macro,
# need to restore it here
-%define version %{specversion}
+%define version %{specrpmversion}
# with_bpftool
%endif
@@ -1177,8 +1178,8 @@ Linux kernel, suitable for the kabi-dw tool.
%define kernel_debuginfo_package() \
%package %{?1:%{1}-}debuginfo\
Summary: Debug information for package %{name}%{?1:-%{1}}\
-Requires: %{name}-debuginfo-common-%{_target_cpu} = %{version}-%{release}\
-Provides: %{name}%{?1:-%{1}}-debuginfo-%{_target_cpu} = %{version}-%{release}\
+Requires: %{name}-debuginfo-common-%{_target_cpu} = %{specrpmversion}-%{release}\
+Provides: %{name}%{?1:-%{1}}-debuginfo-%{_target_cpu} = %{specrpmversion}-%{release}\
Provides: installonlypkg(kernel)\
AutoReqProv: no\
%description %{?1:%{1}-}debuginfo\
@@ -1194,8 +1195,8 @@ This is required to use SystemTap with %{name}%{?1:-%{1}}-%{KVERREL}.\
%define kernel_devel_package(m) \
%package %{?1:%{1}-}devel\
Summary: Development package for building kernel modules to match the %{?2:%{2} }kernel\
-Provides: kernel%{?1:-%{1}}-devel-%{_target_cpu} = %{version}-%{release}\
-Provides: kernel-devel-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\
+Provides: kernel%{?1:-%{1}}-devel-%{_target_cpu} = %{specrpmversion}-%{release}\
+Provides: kernel-devel-%{_target_cpu} = %{specrpmversion}-%{release}%{?1:+%{1}}\
Provides: kernel-devel-uname-r = %{KVERREL}%{?1:+%{1}}\
Provides: installonlypkg(kernel)\
AutoReqProv: no\
@@ -1224,8 +1225,8 @@ against the %{?2:%{2} }kernel package.\
%define kernel_devel_matched_package(m) \
%package %{?1:%{1}-}devel-matched\
Summary: Meta package to install matching core and devel packages for a given %{?2:%{2} }kernel\
-Requires: %{package_name}%{?1:-%{1}}-devel = %{version}-%{release}\
-Requires: %{package_name}%{?1:-%{1}}-core = %{version}-%{release}\
+Requires: %{package_name}%{?1:-%{1}}-devel = %{specrpmversion}-%{release}\
+Requires: %{package_name}%{?1:-%{1}}-core = %{specrpmversion}-%{release}\
%description %{?1:%{1}-}devel-matched\
This meta package is used to install matching core and devel packages for a given %{?2:%{2} }kernel.\
%{nil}
@@ -1250,9 +1251,9 @@ This package provides *.ipa-clones files.\
%package %{?1:%{1}-}modules-internal\
Summary: Extra kernel modules to match the %{?2:%{2} }kernel\
Group: System Environment/Kernel\
-Provides: kernel%{?1:-%{1}}-modules-internal-%{_target_cpu} = %{version}-%{release}\
-Provides: kernel%{?1:-%{1}}-modules-internal-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\
-Provides: kernel%{?1:-%{1}}-modules-internal = %{version}-%{release}%{?1:+%{1}}\
+Provides: kernel%{?1:-%{1}}-modules-internal-%{_target_cpu} = %{specrpmversion}-%{release}\
+Provides: kernel%{?1:-%{1}}-modules-internal-%{_target_cpu} = %{specrpmversion}-%{release}%{?1:+%{1}}\
+Provides: kernel%{?1:-%{1}}-modules-internal = %{specrpmversion}-%{release}%{?1:+%{1}}\
Provides: installonlypkg(kernel-module)\
Provides: kernel%{?1:-%{1}}-modules-internal-uname-r = %{KVERREL}%{?1:+%{1}}\
Requires: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
@@ -1271,9 +1272,9 @@ This package provides kernel modules for the %{?2:%{2} }kernel package for Red H
%define kernel_modules_extra_package(m) \
%package %{?1:%{1}-}modules-extra\
Summary: Extra kernel modules to match the %{?2:%{2} }kernel\
-Provides: kernel%{?1:-%{1}}-modules-extra-%{_target_cpu} = %{version}-%{release}\
-Provides: kernel%{?1:-%{1}}-modules-extra-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\
-Provides: kernel%{?1:-%{1}}-modules-extra = %{version}-%{release}%{?1:+%{1}}\
+Provides: kernel%{?1:-%{1}}-modules-extra-%{_target_cpu} = %{specrpmversion}-%{release}\
+Provides: kernel%{?1:-%{1}}-modules-extra-%{_target_cpu} = %{specrpmversion}-%{release}%{?1:+%{1}}\
+Provides: kernel%{?1:-%{1}}-modules-extra = %{specrpmversion}-%{release}%{?1:+%{1}}\
Provides: installonlypkg(kernel-module)\
Provides: kernel%{?1:-%{1}}-modules-extra-uname-r = %{KVERREL}%{?1:+%{1}}\
Requires: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
@@ -1295,9 +1296,9 @@ This package provides less commonly used kernel modules for the %{?2:%{2} }kerne
%define kernel_modules_package(m) \
%package %{?1:%{1}-}modules\
Summary: kernel modules to match the %{?2:%{2}-}core kernel\
-Provides: kernel%{?1:-%{1}}-modules-%{_target_cpu} = %{version}-%{release}\
-Provides: kernel-modules-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\
-Provides: kernel-modules = %{version}-%{release}%{?1:+%{1}}\
+Provides: kernel%{?1:-%{1}}-modules-%{_target_cpu} = %{specrpmversion}-%{release}\
+Provides: kernel-modules-%{_target_cpu} = %{specrpmversion}-%{release}%{?1:+%{1}}\
+Provides: kernel-modules = %{specrpmversion}-%{release}%{?1:+%{1}}\
Provides: installonlypkg(kernel-module)\
Provides: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?1:+%{1}}\
Requires: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
@@ -1318,9 +1319,9 @@ This package provides commonly used kernel modules for the %{?2:%{2}-}core kerne
%define kernel_modules_core_package(m) \
%package %{?1:%{1}-}modules-core\
Summary: Core kernel modules to match the %{?2:%{2}-}core kernel\
-Provides: kernel%{?1:-%{1}}-modules-core-%{_target_cpu} = %{version}-%{release}\
-Provides: kernel-modules-core-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\
-Provides: kernel-modules-core = %{version}-%{release}%{?1:+%{1}}\
+Provides: kernel%{?1:-%{1}}-modules-core-%{_target_cpu} = %{specrpmversion}-%{release}\
+Provides: kernel-modules-core-%{_target_cpu} = %{specrpmversion}-%{release}%{?1:+%{1}}\
+Provides: kernel-modules-core = %{specrpmversion}-%{release}%{?1:+%{1}}\
Provides: installonlypkg(kernel-module)\
Provides: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\
Requires: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
@@ -1395,9 +1396,9 @@ Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\
%package %{?1:%{1}-}modules-partner\
Summary: Extra kernel modules to match the %{?2:%{2} }kernel\
Group: System Environment/Kernel\
-Provides: kernel%{?1:-%{1}}-modules-partner-%{_target_cpu} = %{version}-%{release}\
-Provides: kernel%{?1:-%{1}}-modules-partner-%{_target_cpu} = %{version}-%{release}%{?1:+%{1}}\
-Provides: kernel%{?1:-%{1}}-modules-partner = %{version}-%{release}%{?1:+%{1}}\
+Provides: kernel%{?1:-%{1}}-modules-partner-%{_target_cpu} = %{specrpmversion}-%{release}\
+Provides: kernel%{?1:-%{1}}-modules-partner-%{_target_cpu} = %{specrpmversion}-%{release}%{?1:+%{1}}\
+Provides: kernel%{?1:-%{1}}-modules-partner = %{specrpmversion}-%{release}%{?1:+%{1}}\
Provides: installonlypkg(kernel-module)\
Provides: kernel%{?1:-%{1}}-modules-partner-uname-r = %{KVERREL}%{?1:+%{1}}\
Requires: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
@@ -1539,7 +1540,7 @@ ApplyOptionalPatch linux-kernel-test.patch
# Any further pre-build tree manipulations happen here.
chmod +x scripts/checkpatch.pl
-mv COPYING COPYING-%{version}-%{release}
+mv COPYING COPYING-%{specrpmversion}-%{release}
# Mangle /usr/bin/python shebangs to /usr/bin/python3
# Mangle all Python shebangs to be Python 3 explicitly
@@ -1576,7 +1577,7 @@ cp %{SOURCE80} .
cp %{SOURCE3000} .
# kernel-local
cp %{SOURCE3001} .
-FLAVOR=%{primary_target} SPECPACKAGE_NAME=%{name} SPECVERSION=%{version} ./generate_all_configs.sh %{debugbuildsenabled}
+FLAVOR=%{primary_target} SPECPACKAGE_NAME=%{name} SPECVERSION=%{specversion} SPECRPMVERSION=%{specrpmversion} ./generate_all_configs.sh %{debugbuildsenabled}
# Merge in any user-provided local config option changes
%ifnarch %nobuildarches
@@ -1634,7 +1635,7 @@ for opt in %{clang_make_opts}; do
OPTS="$OPTS -m $opt"
done
%endif
-RHJOBS=$RPM_BUILD_NCPUS SPECPACKAGE_NAME=%{name} ./process_configs.sh $OPTS %{specversion}
+RHJOBS=$RPM_BUILD_NCPUS SPECPACKAGE_NAME=%{name} ./process_configs.sh $OPTS %{specrpmversion}
cp %{SOURCE82} .
RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target}
@@ -1699,10 +1700,10 @@ InitBuildVars() {
Variant=$1
# Pick the right kernel config file
- Config=%{name}-%{version}-%{_target_cpu}${Variant:+-${Variant}}.config
+ Config=%{name}-%{specrpmversion}-%{_target_cpu}${Variant:+-${Variant}}.config
DevelDir=/usr/src/kernels/%{KVERREL}${Variant:++${Variant}}
- KernelVer=%{version}-%{release}.%{_target_cpu}${Variant:++${Variant}}
+ KernelVer=%{specversion}-%{release}.%{_target_cpu}${Variant:++${Variant}}
# make sure EXTRAVERSION says what we want it to say
# Trim the release if this is a CI build, since KERNELVERSION is limited to 64 characters
diff --git a/redhat/scripts/genspec/genspec.sh b/redhat/scripts/genspec/genspec.sh
index blahblah..blahblah 100755
--- a/redhat/scripts/genspec/genspec.sh
+++ b/redhat/scripts/genspec/genspec.sh
@@ -54,6 +54,7 @@ test -f "$SOURCES/$SPECFILE" &&
s/%%SPECINCLUDE_RHEL_FILES%%/$SPECINCLUDE_RHEL_FILES/
s/%%SPECPATCHLIST_CHANGELOG%%/$SPECPATCHLIST_CHANGELOG/
s/%%SPECVERSION%%/$SPECVERSION/
+ s/%%SPECRPMVERSION%%/$SPECRPMVERSION/
s/%%SPECKABIVERSION%%/$SPECKABIVERSION/
s/%%SPECBPFTOOLVERSION%%/$SPECBPFTOOLVERSION/
s/%%SPECTARFILE_RELEASE%%/$SPECTARFILE_RELEASE/
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
@@ -82,6 +82,7 @@ SPECKSUBLEVEL=0
SPECKVERSION=5
SPECPACKAGE_NAME=kernel
SPECRELEASED_KERNEL=0
+SPECRPMVERSION=5.16.0
SPECSELFTESTS_MUST_BUILD=0
SPECTARFILE_RELEASE=5.16.0-0.rc5.6.test.el7
SPECVERSION=5.16.0
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
+++ b/redhat/self-test/data/centos-2585cf9dfaad.el7.spec
@@ -4,6 +4,7 @@
%global patchlist_changelog 0
%global released_kernel 0
%define buildid .test
+%define specrpmversion 5.16.0
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 0.rc5.6.test
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
@@ -82,6 +82,7 @@ SPECKSUBLEVEL=0
SPECKVERSION=5
SPECPACKAGE_NAME=kernel
SPECRELEASED_KERNEL=0
+SPECRPMVERSION=5.16.0
SPECSELFTESTS_MUST_BUILD=0
SPECTARFILE_RELEASE=5.16.0-0.rc5.6.test.fc25
SPECVERSION=5.16.0
diff --git a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
+++ b/redhat/self-test/data/centos-2585cf9dfaad.fc25.spec
@@ -4,6 +4,7 @@
%global patchlist_changelog 0
%global released_kernel 0
%define buildid .test
+%define specrpmversion 5.16.0
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 0.rc5.6.test
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
@@ -82,6 +82,7 @@ SPECKSUBLEVEL=0
SPECKVERSION=5
SPECPACKAGE_NAME=kernel
SPECRELEASED_KERNEL=0
+SPECRPMVERSION=5.17.0
SPECSELFTESTS_MUST_BUILD=0
SPECTARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae.6.test.el7
SPECVERSION=5.17.0
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
+++ b/redhat/self-test/data/centos-78e36f3b0dae.el7.spec
@@ -4,6 +4,7 @@
%global patchlist_changelog 0
%global released_kernel 0
%define buildid .test
+%define specrpmversion 5.17.0
%define specversion 5.17.0
%define patchversion 5.17
%define pkgrelease 0.rc0.78e36f3b0dae.6.test
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
@@ -82,6 +82,7 @@ SPECKSUBLEVEL=0
SPECKVERSION=5
SPECPACKAGE_NAME=kernel
SPECRELEASED_KERNEL=0
+SPECRPMVERSION=5.17.0
SPECSELFTESTS_MUST_BUILD=0
SPECTARFILE_RELEASE=5.17.0-0.rc0.78e36f3b0dae.6.test.fc25
SPECVERSION=5.17.0
diff --git a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
+++ b/redhat/self-test/data/centos-78e36f3b0dae.fc25.spec
@@ -4,6 +4,7 @@
%global patchlist_changelog 0
%global released_kernel 0
%define buildid .test
+%define specrpmversion 5.17.0
%define specversion 5.17.0
%define patchversion 5.17
%define pkgrelease 0.rc0.78e36f3b0dae.6.test
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
@@ -82,6 +82,7 @@ SPECKSUBLEVEL=0
SPECKVERSION=5
SPECPACKAGE_NAME=kernel
SPECRELEASED_KERNEL=0
+SPECRPMVERSION=5.16.0
SPECSELFTESTS_MUST_BUILD=0
SPECTARFILE_RELEASE=5.16.0-6.test.el7
SPECVERSION=5.16.0
diff --git a/redhat/self-test/data/centos-df0cc57e057f.el7.spec b/redhat/self-test/data/centos-df0cc57e057f.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-df0cc57e057f.el7.spec
+++ b/redhat/self-test/data/centos-df0cc57e057f.el7.spec
@@ -4,6 +4,7 @@
%global patchlist_changelog 0
%global released_kernel 0
%define buildid .test
+%define specrpmversion 5.16.0
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 6.test
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
@@ -82,6 +82,7 @@ SPECKSUBLEVEL=0
SPECKVERSION=5
SPECPACKAGE_NAME=kernel
SPECRELEASED_KERNEL=0
+SPECRPMVERSION=5.16.0
SPECSELFTESTS_MUST_BUILD=0
SPECTARFILE_RELEASE=5.16.0-6.test.fc25
SPECVERSION=5.16.0
diff --git a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
+++ b/redhat/self-test/data/centos-df0cc57e057f.fc25.spec
@@ -4,6 +4,7 @@
%global patchlist_changelog 0
%global released_kernel 0
%define buildid .test
+%define specrpmversion 5.16.0
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 6.test
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
@@ -82,6 +82,7 @@ SPECKSUBLEVEL=0
SPECKVERSION=5
SPECPACKAGE_NAME=kernel
SPECRELEASED_KERNEL=0
+SPECRPMVERSION=5.16.0
SPECSELFTESTS_MUST_BUILD=0
SPECTARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fb.6.test.el7
SPECVERSION=5.16.0
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
+++ b/redhat/self-test/data/centos-fce15c45d3fb.el7.spec
@@ -4,6 +4,7 @@
%global patchlist_changelog 0
%global released_kernel 0
%define buildid .test
+%define specrpmversion 5.16.0
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 0.rc5.fce15c45d3fb.6.test
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
@@ -82,6 +82,7 @@ SPECKSUBLEVEL=0
SPECKVERSION=5
SPECPACKAGE_NAME=kernel
SPECRELEASED_KERNEL=0
+SPECRPMVERSION=5.16.0
SPECSELFTESTS_MUST_BUILD=0
SPECTARFILE_RELEASE=5.16.0-0.rc5.fce15c45d3fb.6.test.fc25
SPECVERSION=5.16.0
diff --git a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
index blahblah..blahblah 100755
--- a/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
+++ b/redhat/self-test/data/centos-fce15c45d3fb.fc25.spec
@@ -4,6 +4,7 @@
%global patchlist_changelog 0
%global released_kernel 0
%define buildid .test
+%define specrpmversion 5.16.0
%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 0.rc5.fce15c45d3fb.6.test
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2386
_______________________________________________
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, report it: https://pagure.io/fedora-infrastructure/new_issue
