From: Prarit Bhargava <pra...@redhat.com>
redhat/Makefile: Rename KVERSION to SPECVERSION
KVERSION is passed into the spec file and is easy to confuse with the
kernel KVERSION. Change the name to SPECVERSION so that readers
understand it is the %Version field of the specfile.
As a result RPMKSUBLEVEL can be dropped from genspec.sh.
Rename KVERSION to SPECVERSION and use it in the specfile.
Signed-off-by: Prarit Bhargava <pra...@redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -144,8 +144,8 @@ else
MARKER:=v$(RPMKVERSION).$(RPMKPATCHLEVEL)
UPSTREAM_TARBALL_NAME:=$(RPMKVERSION).$(RPMKPATCHLEVEL)
else
- MARKER:=v$(KVERSION)
- UPSTREAM_TARBALL_NAME:=$(KVERSION)
+ MARKER:=v$(SPECVERSION)
+ UPSTREAM_TARBALL_NAME:=$(SPECVERSION)
endif
PREBUILD:=
endif
@@ -204,13 +204,13 @@ else
SNAPSHOT:=0
endif
-KVERSION:=$(RPMKVERSION).$(RPMKPATCHLEVEL).$(RPMKSUBLEVEL)
+SPECVERSION:=$(RPMKVERSION).$(RPMKPATCHLEVEL).$(RPMKSUBLEVEL)
DISTRO_BUILD:=$(PREBUILD)$(shell echo $(BUILD) | sed -e
's|\(^[0-9]\{1,4\}\)\..*|\1|')
-KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(KVERSION)-$(DISTRO_BUILD).tar.bz2
+KABI_TARBALL:=$(SOURCES)/kernel-abi-stablelists-$(SPECVERSION)-$(DISTRO_BUILD).tar.bz2
KABIDW := $(REDHAT)/kabi-dwarf
-KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(KVERSION)-$(DISTRO_BUILD).tar.bz2
+KABIDW_TARBALL:=$(SOURCES)/kernel-kabi-dw-$(SPECVERSION)-$(DISTRO_BUILD).tar.bz2
PKGRELEASE:=$(PREBUILD)$(BUILD)$(BUILDID)
-RPMVERSION:=$(KVERSION)-$(PKGRELEASE)
+RPMVERSION:=$(SPECVERSION)-$(PKGRELEASE)
SPECRELEASE:=$(PREBUILD)$(BUILD)%{?buildid}%{?dist}
SRPM:=$(SRPMS)/$(PACKAGE_NAME)-$(RPMVERSION)$(DIST).src.rpm
@@ -352,11 +352,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 "$(KVERSION)" "$(FLAVOR)"
+ ./process_configs.sh -z "$(SPECVERSION)" "$(FLAVOR)"
dist-configs: dist-configs-prep
+@cd $(REDHAT)/configs; ./generate_all_configs.sh 1;\
- ./process_configs.sh $(PROCESS_CONFIGS_OPTS) "$(KVERSION)" ""
+ ./process_configs.sh $(PROCESS_CONFIGS_OPTS) "$(SPECVERSION)" ""
dist-fedora-configs: FLAVOR = fedora
dist-fedora-configs: dist-configs
@@ -425,12 +425,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)-$(KVERSION)-$(DISTRO_BUILD)
+ @echo $(PACKAGE_NAME)-$(SPECVERSION)-$(DISTRO_BUILD)
dist-kernelversion:
# deprecated at 5.17.0
@echo "WARNING: This target will be deprecated in a future release."
- @echo $(KVERSION)-$(DISTRO_BUILD)
+ @echo $(SPECVERSION)-$(DISTRO_BUILD)
dist-specfile: setup-source
# deprecated at 5.17.0
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
@@ -18,7 +18,7 @@ else
fi
for i in kernel-*-"$FLAVOR".config; do
- NEW=kernel-"$KVERSION"-$(echo "$i" | cut -d - -f2- | sed s/-"$FLAVOR"//)
+ NEW=kernel-"$SPECVERSION"-$(echo "$i" | cut -d - -f2- | sed
s/-"$FLAVOR"//)
#echo $NEW
mv "$i" "$NEW"
done
diff --git a/redhat/docs/makefile-changes.rst b/redhat/docs/makefile-changes.rst
index blahblah..blahblah 100644
--- a/redhat/docs/makefile-changes.rst
+++ b/redhat/docs/makefile-changes.rst
@@ -73,4 +73,4 @@ or,
dist-kernelversion:
# deprecated in 5.17.0
@echo "WARNING: This target will be removed in a later release."
- @echo $(KVERSION)-$(DISTRO_BUILD)
+ @echo $(SPECVERSION)-$(DISTRO_BUILD)
diff --git a/redhat/genspec.sh b/redhat/genspec.sh
index blahblah..blahblah 100755
--- a/redhat/genspec.sh
+++ b/redhat/genspec.sh
@@ -62,7 +62,6 @@ test -f "$SOURCES/$SPECFILE" &&
s/%%BUILDID%%/$BUILDID_DEFINE/
s/%%RPMKVERSION%%/$RPMKVERSION/
s/%%RPMKPATCHLEVEL%%/$RPMKPATCHLEVEL/
- s/%%RPMKSUBLEVEL%%/$RPMKSUBLEVEL/
s/%%PKGRELEASE%%/$PKGRELEASE/
s/%%SPECRELEASE%%/$SPECRELEASE/
s/%%DISTRO_BUILD%%/$DISTRO_BUILD/
@@ -71,6 +70,7 @@ test -f "$SOURCES/$SPECFILE" &&
s/%%INCLUDE_FEDORA_FILES%%/$INCLUDE_FEDORA_FILES/
s/%%INCLUDE_RHEL_FILES%%/$INCLUDE_RHEL_FILES/
s/%%PATCHLIST_CHANGELOG%%/$PATCHLIST_CHANGELOG/
+ s/%%SPECVERSION%%/$SPECVERSION/
s/%%TARFILE_RELEASE%%/$TARFILE_RELEASE/" "$SOURCES/$SPECFILE"
# We depend on work splitting of BUILDOPTS
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
# The kernel tarball/base version
%define kversion %%RPMKVERSION%%.%%RPMKPATCHLEVEL%%
-%define rpmversion %%RPMKVERSION%%.%%RPMKPATCHLEVEL%%.%%RPMKSUBLEVEL%%
+%define specversion %%SPECVERSION%%
%define patchversion %%RPMKVERSION%%.%%RPMKPATCHLEVEL%%
%define pkgrelease %%PKGRELEASE%%
@@ -553,7 +553,7 @@ Summary: The Linux kernel
Name: kernel
License: GPLv2 and Redistributable, no modification permitted
URL: https://www.kernel.org/
-Version: %{rpmversion}
+Version: %{specversion}
Release: %{pkg_release}
# DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN
ARCHITECTURE BUILD.
# SET %%nobuildarches (ABOVE) INSTEAD
@@ -828,8 +828,8 @@ Source211: Module.kabi_dup_ppc64le
Source212: Module.kabi_dup_s390x
Source213: Module.kabi_dup_x86_64
-Source300: kernel-abi-stablelists-%{rpmversion}-%{distro_build}.tar.bz2
-Source301: kernel-kabi-dw-%{rpmversion}-%{distro_build}.tar.bz2
+Source300: kernel-abi-stablelists-%{specversion}-%{distro_build}.tar.bz2
+Source301: kernel-kabi-dw-%{specversion}-%{distro_build}.tar.bz2
# Sources for kernel-tools
Source2000: cpupower.service
@@ -871,8 +871,8 @@ The kernel meta package
# macros defined above.
#
%define kernel_reqprovconf \
-Provides: kernel = %{rpmversion}-%{pkg_release}\
-Provides: kernel-%{_target_cpu} = %{rpmversion}-%{pkg_release}%{?1:+%{1}}\
+Provides: kernel = %{specversion}-%{pkg_release}\
+Provides: kernel-%{_target_cpu} = %{specversion}-%{pkg_release}%{?1:+%{1}}\
Provides: kernel-drm-nouveau = 16\
Provides: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
Requires(pre): %{kernel_prereq}\
@@ -1441,7 +1441,7 @@ cp %{SOURCE80} .
cp %{SOURCE3000} .
# kernel-local
cp %{SOURCE3001} .
-FLAVOR=%{primary_target} KVERSION=%{version} ./generate_all_configs.sh
%{debugbuildsenabled}
+FLAVOR=%{primary_target} SPECVERSION=%{version} ./generate_all_configs.sh
%{debugbuildsenabled}
# Merge in any user-provided local config option changes
%ifnarch %nobuildarches
@@ -1492,7 +1492,7 @@ for opt in %{clang_make_opts}; do
OPTS="$OPTS -m $opt"
done
%endif
-RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS
${rpmversion}
+RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS
${specversion}
cp %{SOURCE82} .
RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target}
@@ -2403,7 +2403,7 @@ find Documentation -type d | xargs chmod u+w
cd linux-%{KVERREL}
%if %{with_doc}
-docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}
+docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}
# copy the source over
mkdir -p $docdir
@@ -2811,9 +2811,9 @@ fi
%if %{with_doc}
%files doc
%defattr(-,root,root)
-%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation/*
-%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation
-%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}
+%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}/Documentation/*
+%dir %{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}/Documentation
+%dir %{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}
%endif
%if %{with_perf}
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
@@ -27,7 +27,6 @@ KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.tar.bz2
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.tar.bz2
KEXTRAVERSION=.rc5
-KVERSION=5.16.0
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
@@ -62,6 +61,7 @@ SNAPSHOT=0
SOURCES=../redhat/rpm/SOURCES
SPECFILE=kernel.spec
SPECRELEASE=0.rc5.6%{?buildid}%{?dist}
+SPECVERSION=5.16.0
SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.6.test.el7.src.rpm
SRPMS=../redhat/rpm/SRPMS
TARBALL=../redhat/linux-5.16.0-0.rc5.6.test.tar.xz
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
@@ -129,7 +129,7 @@ Summary: The Linux kernel
# The kernel tarball/base version
%define kversion 5.16
-%define rpmversion 5.16.0
+%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 0.rc5.6.test
@@ -553,7 +553,7 @@ Summary: The Linux kernel
Name: kernel
License: GPLv2 and Redistributable, no modification permitted
URL: https://www.kernel.org/
-Version: %{rpmversion}
+Version: %{specversion}
Release: %{pkg_release}
# DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN
ARCHITECTURE BUILD.
# SET %%nobuildarches (ABOVE) INSTEAD
@@ -828,8 +828,8 @@ Source211: Module.kabi_dup_ppc64le
Source212: Module.kabi_dup_s390x
Source213: Module.kabi_dup_x86_64
-Source300: kernel-abi-stablelists-%{rpmversion}-%{distro_build}.tar.bz2
-Source301: kernel-kabi-dw-%{rpmversion}-%{distro_build}.tar.bz2
+Source300: kernel-abi-stablelists-%{specversion}-%{distro_build}.tar.bz2
+Source301: kernel-kabi-dw-%{specversion}-%{distro_build}.tar.bz2
# Sources for kernel-tools
Source2000: cpupower.service
@@ -871,8 +871,8 @@ The kernel meta package
# macros defined above.
#
%define kernel_reqprovconf \
-Provides: kernel = %{rpmversion}-%{pkg_release}\
-Provides: kernel-%{_target_cpu} = %{rpmversion}-%{pkg_release}%{?1:+%{1}}\
+Provides: kernel = %{specversion}-%{pkg_release}\
+Provides: kernel-%{_target_cpu} = %{specversion}-%{pkg_release}%{?1:+%{1}}\
Provides: kernel-drm-nouveau = 16\
Provides: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
Requires(pre): %{kernel_prereq}\
@@ -1441,7 +1441,7 @@ cp %{SOURCE80} .
cp %{SOURCE3000} .
# kernel-local
cp %{SOURCE3001} .
-FLAVOR=%{primary_target} KVERSION=%{version} ./generate_all_configs.sh
%{debugbuildsenabled}
+FLAVOR=%{primary_target} SPECVERSION=%{version} ./generate_all_configs.sh
%{debugbuildsenabled}
# Merge in any user-provided local config option changes
%ifnarch %nobuildarches
@@ -1492,7 +1492,7 @@ for opt in %{clang_make_opts}; do
OPTS="$OPTS -m $opt"
done
%endif
-RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS
${rpmversion}
+RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS
${specversion}
cp %{SOURCE82} .
RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target}
@@ -2403,7 +2403,7 @@ find Documentation -type d | xargs chmod u+w
cd linux-%{KVERREL}
%if %{with_doc}
-docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}
+docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}
# copy the source over
mkdir -p $docdir
@@ -2811,9 +2811,9 @@ fi
%if %{with_doc}
%files doc
%defattr(-,root,root)
-%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation/*
-%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation
-%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}
+%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}/Documentation/*
+%dir %{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}/Documentation
+%dir %{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}
%endif
%if %{with_perf}
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
@@ -27,7 +27,6 @@ KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.6.tar.bz2
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.6.tar.bz2
KEXTRAVERSION=.rc5
-KVERSION=5.16.0
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
@@ -62,6 +61,7 @@ SNAPSHOT=0
SOURCES=../redhat/rpm/SOURCES
SPECFILE=kernel.spec
SPECRELEASE=0.rc5.6%{?buildid}%{?dist}
+SPECVERSION=5.16.0
SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.6.test.fc25.src.rpm
SRPMS=../redhat/rpm/SRPMS
TARBALL=../redhat/linux-5.16.0-0.rc5.6.test.tar.xz
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
@@ -129,7 +129,7 @@ Summary: The Linux kernel
# The kernel tarball/base version
%define kversion 5.16
-%define rpmversion 5.16.0
+%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 0.rc5.6.test
@@ -553,7 +553,7 @@ Summary: The Linux kernel
Name: kernel
License: GPLv2 and Redistributable, no modification permitted
URL: https://www.kernel.org/
-Version: %{rpmversion}
+Version: %{specversion}
Release: %{pkg_release}
# DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN
ARCHITECTURE BUILD.
# SET %%nobuildarches (ABOVE) INSTEAD
@@ -828,8 +828,8 @@ Source211: Module.kabi_dup_ppc64le
Source212: Module.kabi_dup_s390x
Source213: Module.kabi_dup_x86_64
-Source300: kernel-abi-stablelists-%{rpmversion}-%{distro_build}.tar.bz2
-Source301: kernel-kabi-dw-%{rpmversion}-%{distro_build}.tar.bz2
+Source300: kernel-abi-stablelists-%{specversion}-%{distro_build}.tar.bz2
+Source301: kernel-kabi-dw-%{specversion}-%{distro_build}.tar.bz2
# Sources for kernel-tools
Source2000: cpupower.service
@@ -871,8 +871,8 @@ The kernel meta package
# macros defined above.
#
%define kernel_reqprovconf \
-Provides: kernel = %{rpmversion}-%{pkg_release}\
-Provides: kernel-%{_target_cpu} = %{rpmversion}-%{pkg_release}%{?1:+%{1}}\
+Provides: kernel = %{specversion}-%{pkg_release}\
+Provides: kernel-%{_target_cpu} = %{specversion}-%{pkg_release}%{?1:+%{1}}\
Provides: kernel-drm-nouveau = 16\
Provides: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
Requires(pre): %{kernel_prereq}\
@@ -1441,7 +1441,7 @@ cp %{SOURCE80} .
cp %{SOURCE3000} .
# kernel-local
cp %{SOURCE3001} .
-FLAVOR=%{primary_target} KVERSION=%{version} ./generate_all_configs.sh
%{debugbuildsenabled}
+FLAVOR=%{primary_target} SPECVERSION=%{version} ./generate_all_configs.sh
%{debugbuildsenabled}
# Merge in any user-provided local config option changes
%ifnarch %nobuildarches
@@ -1492,7 +1492,7 @@ for opt in %{clang_make_opts}; do
OPTS="$OPTS -m $opt"
done
%endif
-RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS
${rpmversion}
+RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS
${specversion}
cp %{SOURCE82} .
RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target}
@@ -2403,7 +2403,7 @@ find Documentation -type d | xargs chmod u+w
cd linux-%{KVERREL}
%if %{with_doc}
-docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}
+docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}
# copy the source over
mkdir -p $docdir
@@ -2811,9 +2811,9 @@ fi
%if %{with_doc}
%files doc
%defattr(-,root,root)
-%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation/*
-%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation
-%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}
+%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}/Documentation/*
+%dir %{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}/Documentation
+%dir %{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}
%endif
%if %{with_perf}
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
@@ -27,7 +27,6 @@ KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae586.6.tar.bz2
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae586.6.tar.bz2
KEXTRAVERSION=.rc0
-KVERSION=5.17.0
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
@@ -62,6 +61,7 @@ SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECFILE=kernel.spec
SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist}
+SPECVERSION=5.17.0
SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test.el7.src.rpm
SRPMS=../redhat/rpm/SRPMS
TARBALL=../redhat/linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz
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
@@ -129,7 +129,7 @@ Summary: The Linux kernel
# The kernel tarball/base version
%define kversion 5.17
-%define rpmversion 5.17.0
+%define specversion 5.17.0
%define patchversion 5.17
%define pkgrelease 0.rc0.78e36f3b0dae586.6.test
@@ -553,7 +553,7 @@ Summary: The Linux kernel
Name: kernel
License: GPLv2 and Redistributable, no modification permitted
URL: https://www.kernel.org/
-Version: %{rpmversion}
+Version: %{specversion}
Release: %{pkg_release}
# DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN
ARCHITECTURE BUILD.
# SET %%nobuildarches (ABOVE) INSTEAD
@@ -828,8 +828,8 @@ Source211: Module.kabi_dup_ppc64le
Source212: Module.kabi_dup_s390x
Source213: Module.kabi_dup_x86_64
-Source300: kernel-abi-stablelists-%{rpmversion}-%{distro_build}.tar.bz2
-Source301: kernel-kabi-dw-%{rpmversion}-%{distro_build}.tar.bz2
+Source300: kernel-abi-stablelists-%{specversion}-%{distro_build}.tar.bz2
+Source301: kernel-kabi-dw-%{specversion}-%{distro_build}.tar.bz2
# Sources for kernel-tools
Source2000: cpupower.service
@@ -871,8 +871,8 @@ The kernel meta package
# macros defined above.
#
%define kernel_reqprovconf \
-Provides: kernel = %{rpmversion}-%{pkg_release}\
-Provides: kernel-%{_target_cpu} = %{rpmversion}-%{pkg_release}%{?1:+%{1}}\
+Provides: kernel = %{specversion}-%{pkg_release}\
+Provides: kernel-%{_target_cpu} = %{specversion}-%{pkg_release}%{?1:+%{1}}\
Provides: kernel-drm-nouveau = 16\
Provides: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
Requires(pre): %{kernel_prereq}\
@@ -1441,7 +1441,7 @@ cp %{SOURCE80} .
cp %{SOURCE3000} .
# kernel-local
cp %{SOURCE3001} .
-FLAVOR=%{primary_target} KVERSION=%{version} ./generate_all_configs.sh
%{debugbuildsenabled}
+FLAVOR=%{primary_target} SPECVERSION=%{version} ./generate_all_configs.sh
%{debugbuildsenabled}
# Merge in any user-provided local config option changes
%ifnarch %nobuildarches
@@ -1492,7 +1492,7 @@ for opt in %{clang_make_opts}; do
OPTS="$OPTS -m $opt"
done
%endif
-RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS
${rpmversion}
+RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS
${specversion}
cp %{SOURCE82} .
RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target}
@@ -2403,7 +2403,7 @@ find Documentation -type d | xargs chmod u+w
cd linux-%{KVERREL}
%if %{with_doc}
-docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}
+docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}
# copy the source over
mkdir -p $docdir
@@ -2811,9 +2811,9 @@ fi
%if %{with_doc}
%files doc
%defattr(-,root,root)
-%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation/*
-%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation
-%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}
+%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}/Documentation/*
+%dir %{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}/Documentation
+%dir %{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}
%endif
%if %{with_perf}
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
@@ -27,7 +27,6 @@ KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.17.0-0.rc0.78e36f3b0dae586.6.tar.bz2
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.17.0-0.rc0.78e36f3b0dae586.6.tar.bz2
KEXTRAVERSION=.rc0
-KVERSION=5.17.0
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
@@ -62,6 +61,7 @@ SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECFILE=kernel.spec
SPECRELEASE=0.rc0.78e36f3b0dae586.6%{?buildid}%{?dist}
+SPECVERSION=5.17.0
SRPM=../redhat/rpm/SRPMS/kernel-5.17.0-0.rc0.78e36f3b0dae586.6.test.fc25.src.rpm
SRPMS=../redhat/rpm/SRPMS
TARBALL=../redhat/linux-5.17.0-0.rc0.78e36f3b0dae586.6.test.tar.xz
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
@@ -129,7 +129,7 @@ Summary: The Linux kernel
# The kernel tarball/base version
%define kversion 5.17
-%define rpmversion 5.17.0
+%define specversion 5.17.0
%define patchversion 5.17
%define pkgrelease 0.rc0.78e36f3b0dae586.6.test
@@ -553,7 +553,7 @@ Summary: The Linux kernel
Name: kernel
License: GPLv2 and Redistributable, no modification permitted
URL: https://www.kernel.org/
-Version: %{rpmversion}
+Version: %{specversion}
Release: %{pkg_release}
# DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN
ARCHITECTURE BUILD.
# SET %%nobuildarches (ABOVE) INSTEAD
@@ -828,8 +828,8 @@ Source211: Module.kabi_dup_ppc64le
Source212: Module.kabi_dup_s390x
Source213: Module.kabi_dup_x86_64
-Source300: kernel-abi-stablelists-%{rpmversion}-%{distro_build}.tar.bz2
-Source301: kernel-kabi-dw-%{rpmversion}-%{distro_build}.tar.bz2
+Source300: kernel-abi-stablelists-%{specversion}-%{distro_build}.tar.bz2
+Source301: kernel-kabi-dw-%{specversion}-%{distro_build}.tar.bz2
# Sources for kernel-tools
Source2000: cpupower.service
@@ -871,8 +871,8 @@ The kernel meta package
# macros defined above.
#
%define kernel_reqprovconf \
-Provides: kernel = %{rpmversion}-%{pkg_release}\
-Provides: kernel-%{_target_cpu} = %{rpmversion}-%{pkg_release}%{?1:+%{1}}\
+Provides: kernel = %{specversion}-%{pkg_release}\
+Provides: kernel-%{_target_cpu} = %{specversion}-%{pkg_release}%{?1:+%{1}}\
Provides: kernel-drm-nouveau = 16\
Provides: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
Requires(pre): %{kernel_prereq}\
@@ -1441,7 +1441,7 @@ cp %{SOURCE80} .
cp %{SOURCE3000} .
# kernel-local
cp %{SOURCE3001} .
-FLAVOR=%{primary_target} KVERSION=%{version} ./generate_all_configs.sh
%{debugbuildsenabled}
+FLAVOR=%{primary_target} SPECVERSION=%{version} ./generate_all_configs.sh
%{debugbuildsenabled}
# Merge in any user-provided local config option changes
%ifnarch %nobuildarches
@@ -1492,7 +1492,7 @@ for opt in %{clang_make_opts}; do
OPTS="$OPTS -m $opt"
done
%endif
-RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS
${rpmversion}
+RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS
${specversion}
cp %{SOURCE82} .
RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target}
@@ -2403,7 +2403,7 @@ find Documentation -type d | xargs chmod u+w
cd linux-%{KVERREL}
%if %{with_doc}
-docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}
+docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}
# copy the source over
mkdir -p $docdir
@@ -2811,9 +2811,9 @@ fi
%if %{with_doc}
%files doc
%defattr(-,root,root)
-%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation/*
-%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation
-%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}
+%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}/Documentation/*
+%dir %{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}/Documentation
+%dir %{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}
%endif
%if %{with_perf}
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
@@ -27,7 +27,6 @@ KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.tar.bz2
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-6.tar.bz2
KEXTRAVERSION=
-KVERSION=5.16.0
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
@@ -62,6 +61,7 @@ SNAPSHOT=0
SOURCES=../redhat/rpm/SOURCES
SPECFILE=kernel.spec
SPECRELEASE=6%{?buildid}%{?dist}
+SPECVERSION=5.16.0
SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-6.test.el7.src.rpm
SRPMS=../redhat/rpm/SRPMS
TARBALL=../redhat/linux-5.16.0-6.test.tar.xz
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
@@ -129,7 +129,7 @@ Summary: The Linux kernel
# The kernel tarball/base version
%define kversion 5.16
-%define rpmversion 5.16.0
+%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 6.test
@@ -553,7 +553,7 @@ Summary: The Linux kernel
Name: kernel
License: GPLv2 and Redistributable, no modification permitted
URL: https://www.kernel.org/
-Version: %{rpmversion}
+Version: %{specversion}
Release: %{pkg_release}
# DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN
ARCHITECTURE BUILD.
# SET %%nobuildarches (ABOVE) INSTEAD
@@ -828,8 +828,8 @@ Source211: Module.kabi_dup_ppc64le
Source212: Module.kabi_dup_s390x
Source213: Module.kabi_dup_x86_64
-Source300: kernel-abi-stablelists-%{rpmversion}-%{distro_build}.tar.bz2
-Source301: kernel-kabi-dw-%{rpmversion}-%{distro_build}.tar.bz2
+Source300: kernel-abi-stablelists-%{specversion}-%{distro_build}.tar.bz2
+Source301: kernel-kabi-dw-%{specversion}-%{distro_build}.tar.bz2
# Sources for kernel-tools
Source2000: cpupower.service
@@ -871,8 +871,8 @@ The kernel meta package
# macros defined above.
#
%define kernel_reqprovconf \
-Provides: kernel = %{rpmversion}-%{pkg_release}\
-Provides: kernel-%{_target_cpu} = %{rpmversion}-%{pkg_release}%{?1:+%{1}}\
+Provides: kernel = %{specversion}-%{pkg_release}\
+Provides: kernel-%{_target_cpu} = %{specversion}-%{pkg_release}%{?1:+%{1}}\
Provides: kernel-drm-nouveau = 16\
Provides: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
Requires(pre): %{kernel_prereq}\
@@ -1441,7 +1441,7 @@ cp %{SOURCE80} .
cp %{SOURCE3000} .
# kernel-local
cp %{SOURCE3001} .
-FLAVOR=%{primary_target} KVERSION=%{version} ./generate_all_configs.sh
%{debugbuildsenabled}
+FLAVOR=%{primary_target} SPECVERSION=%{version} ./generate_all_configs.sh
%{debugbuildsenabled}
# Merge in any user-provided local config option changes
%ifnarch %nobuildarches
@@ -1492,7 +1492,7 @@ for opt in %{clang_make_opts}; do
OPTS="$OPTS -m $opt"
done
%endif
-RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS
${rpmversion}
+RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS
${specversion}
cp %{SOURCE82} .
RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target}
@@ -2403,7 +2403,7 @@ find Documentation -type d | xargs chmod u+w
cd linux-%{KVERREL}
%if %{with_doc}
-docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}
+docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}
# copy the source over
mkdir -p $docdir
@@ -2811,9 +2811,9 @@ fi
%if %{with_doc}
%files doc
%defattr(-,root,root)
-%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation/*
-%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation
-%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}
+%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}/Documentation/*
+%dir %{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}/Documentation
+%dir %{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}
%endif
%if %{with_perf}
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
@@ -27,7 +27,6 @@ KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-6.tar.bz2
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-6.tar.bz2
KEXTRAVERSION=
-KVERSION=5.16.0
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
@@ -62,6 +61,7 @@ SNAPSHOT=0
SOURCES=../redhat/rpm/SOURCES
SPECFILE=kernel.spec
SPECRELEASE=6%{?buildid}%{?dist}
+SPECVERSION=5.16.0
SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-6.test.fc25.src.rpm
SRPMS=../redhat/rpm/SRPMS
TARBALL=../redhat/linux-5.16.0-6.test.tar.xz
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
@@ -129,7 +129,7 @@ Summary: The Linux kernel
# The kernel tarball/base version
%define kversion 5.16
-%define rpmversion 5.16.0
+%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 6.test
@@ -553,7 +553,7 @@ Summary: The Linux kernel
Name: kernel
License: GPLv2 and Redistributable, no modification permitted
URL: https://www.kernel.org/
-Version: %{rpmversion}
+Version: %{specversion}
Release: %{pkg_release}
# DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN
ARCHITECTURE BUILD.
# SET %%nobuildarches (ABOVE) INSTEAD
@@ -828,8 +828,8 @@ Source211: Module.kabi_dup_ppc64le
Source212: Module.kabi_dup_s390x
Source213: Module.kabi_dup_x86_64
-Source300: kernel-abi-stablelists-%{rpmversion}-%{distro_build}.tar.bz2
-Source301: kernel-kabi-dw-%{rpmversion}-%{distro_build}.tar.bz2
+Source300: kernel-abi-stablelists-%{specversion}-%{distro_build}.tar.bz2
+Source301: kernel-kabi-dw-%{specversion}-%{distro_build}.tar.bz2
# Sources for kernel-tools
Source2000: cpupower.service
@@ -871,8 +871,8 @@ The kernel meta package
# macros defined above.
#
%define kernel_reqprovconf \
-Provides: kernel = %{rpmversion}-%{pkg_release}\
-Provides: kernel-%{_target_cpu} = %{rpmversion}-%{pkg_release}%{?1:+%{1}}\
+Provides: kernel = %{specversion}-%{pkg_release}\
+Provides: kernel-%{_target_cpu} = %{specversion}-%{pkg_release}%{?1:+%{1}}\
Provides: kernel-drm-nouveau = 16\
Provides: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
Requires(pre): %{kernel_prereq}\
@@ -1441,7 +1441,7 @@ cp %{SOURCE80} .
cp %{SOURCE3000} .
# kernel-local
cp %{SOURCE3001} .
-FLAVOR=%{primary_target} KVERSION=%{version} ./generate_all_configs.sh
%{debugbuildsenabled}
+FLAVOR=%{primary_target} SPECVERSION=%{version} ./generate_all_configs.sh
%{debugbuildsenabled}
# Merge in any user-provided local config option changes
%ifnarch %nobuildarches
@@ -1492,7 +1492,7 @@ for opt in %{clang_make_opts}; do
OPTS="$OPTS -m $opt"
done
%endif
-RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS
${rpmversion}
+RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS
${specversion}
cp %{SOURCE82} .
RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target}
@@ -2403,7 +2403,7 @@ find Documentation -type d | xargs chmod u+w
cd linux-%{KVERREL}
%if %{with_doc}
-docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}
+docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}
# copy the source over
mkdir -p $docdir
@@ -2811,9 +2811,9 @@ fi
%if %{with_doc}
%files doc
%defattr(-,root,root)
-%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation/*
-%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation
-%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}
+%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}/Documentation/*
+%dir %{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}/Documentation
+%dir %{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}
%endif
%if %{with_perf}
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
@@ -27,7 +27,6 @@ KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fbd9f.6.tar.bz2
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fbd9f.6.tar.bz2
KEXTRAVERSION=.rc5
-KVERSION=5.16.0
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
@@ -62,6 +61,7 @@ SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECFILE=kernel.spec
SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist}
+SPECVERSION=5.16.0
SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.el7.src.rpm
SRPMS=../redhat/rpm/SRPMS
TARBALL=../redhat/linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.xz
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
@@ -129,7 +129,7 @@ Summary: The Linux kernel
# The kernel tarball/base version
%define kversion 5.16
-%define rpmversion 5.16.0
+%define specversion 5.16.0
%define patchversion 5.16
%define pkgrelease 0.rc5.fce15c45d3fbd9f.6.test
@@ -553,7 +553,7 @@ Summary: The Linux kernel
Name: kernel
License: GPLv2 and Redistributable, no modification permitted
URL: https://www.kernel.org/
-Version: %{rpmversion}
+Version: %{specversion}
Release: %{pkg_release}
# DO NOT CHANGE THE 'ExclusiveArch' LINE TO TEMPORARILY EXCLUDE AN
ARCHITECTURE BUILD.
# SET %%nobuildarches (ABOVE) INSTEAD
@@ -828,8 +828,8 @@ Source211: Module.kabi_dup_ppc64le
Source212: Module.kabi_dup_s390x
Source213: Module.kabi_dup_x86_64
-Source300: kernel-abi-stablelists-%{rpmversion}-%{distro_build}.tar.bz2
-Source301: kernel-kabi-dw-%{rpmversion}-%{distro_build}.tar.bz2
+Source300: kernel-abi-stablelists-%{specversion}-%{distro_build}.tar.bz2
+Source301: kernel-kabi-dw-%{specversion}-%{distro_build}.tar.bz2
# Sources for kernel-tools
Source2000: cpupower.service
@@ -871,8 +871,8 @@ The kernel meta package
# macros defined above.
#
%define kernel_reqprovconf \
-Provides: kernel = %{rpmversion}-%{pkg_release}\
-Provides: kernel-%{_target_cpu} = %{rpmversion}-%{pkg_release}%{?1:+%{1}}\
+Provides: kernel = %{specversion}-%{pkg_release}\
+Provides: kernel-%{_target_cpu} = %{specversion}-%{pkg_release}%{?1:+%{1}}\
Provides: kernel-drm-nouveau = 16\
Provides: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\
Requires(pre): %{kernel_prereq}\
@@ -1441,7 +1441,7 @@ cp %{SOURCE80} .
cp %{SOURCE3000} .
# kernel-local
cp %{SOURCE3001} .
-FLAVOR=%{primary_target} KVERSION=%{version} ./generate_all_configs.sh
%{debugbuildsenabled}
+FLAVOR=%{primary_target} SPECVERSION=%{version} ./generate_all_configs.sh
%{debugbuildsenabled}
# Merge in any user-provided local config option changes
%ifnarch %nobuildarches
@@ -1492,7 +1492,7 @@ for opt in %{clang_make_opts}; do
OPTS="$OPTS -m $opt"
done
%endif
-RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS
${rpmversion}
+RHJOBS=$RPM_BUILD_NCPUS PACKAGE_NAME=kernel ./process_configs.sh $OPTS
${specversion}
cp %{SOURCE82} .
RPM_SOURCE_DIR=$RPM_SOURCE_DIR ./update_scripts.sh %{primary_target}
@@ -2403,7 +2403,7 @@ find Documentation -type d | xargs chmod u+w
cd linux-%{KVERREL}
%if %{with_doc}
-docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}
+docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}
# copy the source over
mkdir -p $docdir
@@ -2811,9 +2811,9 @@ fi
%if %{with_doc}
%files doc
%defattr(-,root,root)
-%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation/*
-%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation
-%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}
+%{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}/Documentation/*
+%dir %{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}/Documentation
+%dir %{_datadir}/doc/kernel-doc-%{specversion}-%{pkgrelease}
%endif
%if %{with_perf}
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
@@ -27,7 +27,6 @@ KABIDW=../redhat/kabi-dwarf
KABIDW_TARBALL=../redhat/rpm/SOURCES/kernel-kabi-dw-5.16.0-0.rc5.fce15c45d3fbd9f.6.tar.bz2
KABI_TARBALL=../redhat/rpm/SOURCES/kernel-abi-stablelists-5.16.0-0.rc5.fce15c45d3fbd9f.6.tar.bz2
KEXTRAVERSION=.rc5
-KVERSION=5.16.0
LANG=C
LOCVERFILE=../localversion
MACH=x86_64
@@ -62,6 +61,7 @@ SNAPSHOT=1
SOURCES=../redhat/rpm/SOURCES
SPECFILE=kernel.spec
SPECRELEASE=0.rc5.fce15c45d3fbd9f.6%{?buildid}%{?dist}
+SPECVERSION=5.16.0
SRPM=../redhat/rpm/SRPMS/kernel-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.fc25.src.rpm
SRPMS=../redhat/rpm/SRPMS
TARBALL=../redhat/linux-5.16.0-0.rc5.fce15c45d3fbd9f.6.test.tar.xz
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1727
_______________________________________________
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
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@lists.fedoraproject.org
Do not reply to spam on the list, report it:
https://pagure.io/fedora-infrastructure
