kernel-6.3.0-0.rc4.20230329gitfcd476ea6a88.37

* Wed Mar 29 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.3.0-0.rc4.fcd476ea6a88.37] - redhat: kunit: cleanup NITRO config and enable rescale test (Nico Pache) - kernel.spec: use %%{package_name} to fix kernel-devel-matched Requires (Jan Stancek) - kernel.spec: use %%{package_name} also for abi-stablelist subpackages (Jan Stancek) - kernel.spec: use %%{package_name} also for tools subpackages (Jan Stancek) - Linux v6.3.0-0.rc4.fcd476ea6a88 Resolves: Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
2023-03-29 11:49:34 -05:00 · 2023-03-29 11:49:34 -05:00 · bed2460ec0
parent 70d4246fd9
commit bed2460ec0
12 changed files with 59 additions and 43 deletions
--- a/Makefile.rhelver
+++ b/Makefile.rhelver
@ -12,7 +12,7 @@ RHEL_MINOR = 99
 #
 # Use this spot to avoid future merge conflicts.
 # Do not trim this comment.
-RHEL_RELEASE = 36
+RHEL_RELEASE = 37

 #
 # ZSTREAM
--- a/kernel-aarch64-debug-rhel.config
+++ b/kernel-aarch64-debug-rhel.config
@ -2415,6 +2415,7 @@ CONFIG_IIO_FORMAT_KUNIT_TEST=m
 # CONFIG_IIO_KX022A_SPI is not set
 # CONFIG_IIO_MUX is not set
 # CONFIG_IIO_RESCALE is not set
+CONFIG_IIO_RESCALE_KUNIT_TEST=m
 # CONFIG_IIO_SSP_SENSORHUB is not set
 # CONFIG_IIO_ST_ACCEL_3AXIS is not set
 # CONFIG_IIO_ST_GYRO_3AXIS is not set
@ -4083,7 +4084,7 @@ CONFIG_N_HDLC=m
 # CONFIG_NIC7018_WDT is not set
 # CONFIG_NILFS2_FS is not set
 CONFIG_NITRO_ENCLAVES=m
-CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST=y
+# CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST is not set
 # CONFIG_NL80211_TESTMODE is not set
 CONFIG_NLMON=m
 CONFIG_NLS_ASCII=y
--- a/kernel-aarch64-rhel.config
+++ b/kernel-aarch64-rhel.config
@ -2399,6 +2399,7 @@ CONFIG_IIO_FORMAT_KUNIT_TEST=m
 # CONFIG_IIO_KX022A_SPI is not set
 # CONFIG_IIO_MUX is not set
 # CONFIG_IIO_RESCALE is not set
+CONFIG_IIO_RESCALE_KUNIT_TEST=m
 # CONFIG_IIO_SSP_SENSORHUB is not set
 # CONFIG_IIO_ST_ACCEL_3AXIS is not set
 # CONFIG_IIO_ST_GYRO_3AXIS is not set
@ -4062,7 +4063,7 @@ CONFIG_N_HDLC=m
 # CONFIG_NIC7018_WDT is not set
 # CONFIG_NILFS2_FS is not set
 CONFIG_NITRO_ENCLAVES=m
-CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST=y
+# CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST is not set
 # CONFIG_NL80211_TESTMODE is not set
 CONFIG_NLMON=m
 CONFIG_NLS_ASCII=y
--- a/kernel-ppc64le-debug-rhel.config
+++ b/kernel-ppc64le-debug-rhel.config
@ -2201,6 +2201,7 @@ CONFIG_IIO_FORMAT_KUNIT_TEST=m
 # CONFIG_IIO_KX022A_SPI is not set
 # CONFIG_IIO_MUX is not set
 # CONFIG_IIO_RESCALE is not set
+CONFIG_IIO_RESCALE_KUNIT_TEST=m
 # CONFIG_IIO_SSP_SENSORHUB is not set
 # CONFIG_IIO_ST_ACCEL_3AXIS is not set
 # CONFIG_IIO_ST_GYRO_3AXIS is not set
@ -3850,7 +3851,7 @@ CONFIG_N_HDLC=m
 # CONFIG_NIC7018_WDT is not set
 # CONFIG_NILFS2_FS is not set
 CONFIG_NITRO_ENCLAVES=m
-CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST=y
+# CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST is not set
 # CONFIG_NL80211_TESTMODE is not set
 CONFIG_NLMON=m
 CONFIG_NLS_ASCII=y
--- a/kernel-ppc64le-rhel.config
+++ b/kernel-ppc64le-rhel.config
@ -2185,6 +2185,7 @@ CONFIG_IIO_FORMAT_KUNIT_TEST=m
 # CONFIG_IIO_KX022A_SPI is not set
 # CONFIG_IIO_MUX is not set
 # CONFIG_IIO_RESCALE is not set
+CONFIG_IIO_RESCALE_KUNIT_TEST=m
 # CONFIG_IIO_SSP_SENSORHUB is not set
 # CONFIG_IIO_ST_ACCEL_3AXIS is not set
 # CONFIG_IIO_ST_GYRO_3AXIS is not set
@ -3830,7 +3831,7 @@ CONFIG_N_HDLC=m
 # CONFIG_NIC7018_WDT is not set
 # CONFIG_NILFS2_FS is not set
 CONFIG_NITRO_ENCLAVES=m
-CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST=y
+# CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST is not set
 # CONFIG_NL80211_TESTMODE is not set
 CONFIG_NLMON=m
 CONFIG_NLS_ASCII=y
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@ -2188,6 +2188,7 @@ CONFIG_IIO_FORMAT_KUNIT_TEST=m
 # CONFIG_IIO_KX022A_SPI is not set
 # CONFIG_IIO_MUX is not set
 # CONFIG_IIO_RESCALE is not set
+CONFIG_IIO_RESCALE_KUNIT_TEST=m
 # CONFIG_IIO_SSP_SENSORHUB is not set
 # CONFIG_IIO_ST_ACCEL_3AXIS is not set
 # CONFIG_IIO_ST_GYRO_3AXIS is not set
@ -3834,7 +3835,7 @@ CONFIG_N_GSM=m
 # CONFIG_NIC7018_WDT is not set
 # CONFIG_NILFS2_FS is not set
 CONFIG_NITRO_ENCLAVES=m
-CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST=y
+# CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST is not set
 # CONFIG_NL80211_TESTMODE is not set
 CONFIG_NLMON=m
 CONFIG_NLS_ASCII=y
--- a/kernel-s390x-rhel.config
+++ b/kernel-s390x-rhel.config
@ -2172,6 +2172,7 @@ CONFIG_IIO_FORMAT_KUNIT_TEST=m
 # CONFIG_IIO_KX022A_SPI is not set
 # CONFIG_IIO_MUX is not set
 # CONFIG_IIO_RESCALE is not set
+CONFIG_IIO_RESCALE_KUNIT_TEST=m
 # CONFIG_IIO_SSP_SENSORHUB is not set
 # CONFIG_IIO_ST_ACCEL_3AXIS is not set
 # CONFIG_IIO_ST_GYRO_3AXIS is not set
@ -3814,7 +3815,7 @@ CONFIG_N_GSM=m
 # CONFIG_NIC7018_WDT is not set
 # CONFIG_NILFS2_FS is not set
 CONFIG_NITRO_ENCLAVES=m
-CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST=y
+# CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST is not set
 # CONFIG_NL80211_TESTMODE is not set
 CONFIG_NLMON=m
 CONFIG_NLS_ASCII=y
--- a/kernel-s390x-zfcpdump-rhel.config
+++ b/kernel-s390x-zfcpdump-rhel.config
@ -2182,6 +2182,7 @@ CONFIG_IIO_FORMAT_KUNIT_TEST=m
 # CONFIG_IIO_KX022A_SPI is not set
 # CONFIG_IIO_MUX is not set
 # CONFIG_IIO_RESCALE is not set
+CONFIG_IIO_RESCALE_KUNIT_TEST=m
 # CONFIG_IIO_SSP_SENSORHUB is not set
 # CONFIG_IIO_ST_ACCEL_3AXIS is not set
 # CONFIG_IIO_ST_GYRO_3AXIS is not set
@ -3828,7 +3829,7 @@ CONFIG_N_GSM=y
 # CONFIG_NIC7018_WDT is not set
 # CONFIG_NILFS2_FS is not set
 CONFIG_NITRO_ENCLAVES=m
-CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST=y
+# CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST is not set
 # CONFIG_NL80211_TESTMODE is not set
 CONFIG_NLMON=m
 CONFIG_NLS_ASCII=y
--- a/kernel-x86_64-debug-rhel.config
+++ b/kernel-x86_64-debug-rhel.config
@ -2331,6 +2331,7 @@ CONFIG_IIO_FORMAT_KUNIT_TEST=m
 CONFIG_IIO=m
 # CONFIG_IIO_MUX is not set
 # CONFIG_IIO_RESCALE is not set
+CONFIG_IIO_RESCALE_KUNIT_TEST=m
 # CONFIG_IIO_SSP_SENSORHUB is not set
 # CONFIG_IIO_ST_ACCEL_3AXIS is not set
 # CONFIG_IIO_ST_GYRO_3AXIS is not set
@ -4034,7 +4035,7 @@ CONFIG_N_HDLC=m
 # CONFIG_NIC7018_WDT is not set
 # CONFIG_NILFS2_FS is not set
 CONFIG_NITRO_ENCLAVES=m
-CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST=y
+# CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST is not set
 # CONFIG_NL80211_TESTMODE is not set
 CONFIG_NLMON=m
 CONFIG_NLS_ASCII=y
--- a/kernel-x86_64-rhel.config
+++ b/kernel-x86_64-rhel.config
@ -2315,6 +2315,7 @@ CONFIG_IIO_FORMAT_KUNIT_TEST=m
 CONFIG_IIO=m
 # CONFIG_IIO_MUX is not set
 # CONFIG_IIO_RESCALE is not set
+CONFIG_IIO_RESCALE_KUNIT_TEST=m
 # CONFIG_IIO_SSP_SENSORHUB is not set
 # CONFIG_IIO_ST_ACCEL_3AXIS is not set
 # CONFIG_IIO_ST_GYRO_3AXIS is not set
@ -4014,7 +4015,7 @@ CONFIG_N_HDLC=m
 # CONFIG_NIC7018_WDT is not set
 # CONFIG_NILFS2_FS is not set
 CONFIG_NITRO_ENCLAVES=m
-CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST=y
+# CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST is not set
 # CONFIG_NL80211_TESTMODE is not set
 CONFIG_NLMON=m
 CONFIG_NLS_ASCII=y
--- a/kernel.spec
+++ b/kernel.spec
@ -143,13 +143,13 @@ Summary: The Linux kernel
 # define buildid .local
 %define specversion 6.3.0
 %define patchversion 6.3
-%define pkgrelease 0.rc4.20230328git3a93e40326c8.36
+%define pkgrelease 0.rc4.20230329gitfcd476ea6a88.37
 %define kversion 6
-%define tarfile_release 6.3-rc4-25-g3a93e40326c8
+%define tarfile_release 6.3-rc4-34-gfcd476ea6a88
 # This is needed to do merge window version magic
 %define patchlevel 3
 # This allows pkg_release to have configurable %%{?dist} tag
-%define specrelease 0.rc4.20230328git3a93e40326c8.36%{?buildid}%{?dist}
+%define specrelease 0.rc4.20230329gitfcd476ea6a88.37%{?buildid}%{?dist}
 # This defines the kabi tarball version
 %define kabiversion 6.3.0

@ -1028,7 +1028,7 @@ This package provides debug information for the perf python bindings.
 %endif

 %if %{with_tools}
-%package -n kernel-tools
+%package -n %{package_name}-tools
 Summary: Assortment of tools for the Linux kernel
 License: GPLv2
 %ifarch %{cpupowerarchs}
@ -1039,46 +1039,46 @@ 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: kernel-tools-libs = %{version}-%{release}
+Requires: %{package_name}-tools-libs = %{version}-%{release}
 %endif
 %define __requires_exclude ^%{_bindir}/python
-%description -n kernel-tools
+%description -n %{package_name}-tools
 This package contains the tools/ directory from the kernel source
 and the supporting documentation.

-%package -n kernel-tools-libs
+%package -n %{package_name}-tools-libs
 Summary: Libraries for the kernels-tools
 License: GPLv2
-%description -n kernel-tools-libs
+%description -n %{package_name}-tools-libs
 This package contains the libraries built from the tools/ directory
 from the kernel source.

-%package -n kernel-tools-libs-devel
+%package -n %{package_name}-tools-libs-devel
 Summary: Assortment of tools for the Linux kernel
 License: GPLv2
-Requires: kernel-tools = %{version}-%{release}
+Requires: %{package_name}-tools = %{version}-%{release}
 %ifarch %{cpupowerarchs}
 Provides:  cpupowerutils-devel = 1:009-0.6.p1
 Obsoletes: cpupowerutils-devel < 1:009-0.6.p1
 %endif
-Requires: kernel-tools-libs = %{version}-%{release}
-Provides: kernel-tools-devel
-%description -n kernel-tools-libs-devel
+Requires: %{package_name}-libs = %{version}-%{release}
+Provides: %{package_name}-tools-devel
+%description -n %{package_name}-tools-libs-devel
 This package contains the development files for the tools/ directory from
 the kernel source.

-%package -n kernel-tools-debuginfo
-Summary: Debug information for package kernel-tools
+%package -n %{package_name}-tools-debuginfo
+Summary: Debug information for package %{package_name}-tools
 Requires: %{name}-debuginfo-common-%{_target_cpu} = %{version}-%{release}
 AutoReqProv: no
-%description -n kernel-tools-debuginfo
-This package provides debug information for package kernel-tools.
+%description -n %{package_name}-tools-debuginfo
+This package provides debug information for package %{package_name}-tools.

 # Note that this pattern only works right to match the .build-id
 # symlinks because of the trailing nonmatching alternation and
 # the leading .*, because of find-debuginfo.sh's buggy handling
 # of matching the pattern against the symlinks file.
-%{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%%{_bindir}/centrino-decode(\.debug)?|.*%%{_bindir}/powernow-k8-decode(\.debug)?|.*%%{_bindir}/cpupower(\.debug)?|.*%%{_libdir}/libcpupower.*|.*%%{_bindir}/turbostat(\.debug)?|.*%%{_bindir}/x86_energy_perf_policy(\.debug)?|.*%%{_bindir}/tmon(\.debug)?|.*%%{_bindir}/lsgpio(\.debug)?|.*%%{_bindir}/gpio-hammer(\.debug)?|.*%%{_bindir}/gpio-event-mon(\.debug)?|.*%%{_bindir}/gpio-watch(\.debug)?|.*%%{_bindir}/iio_event_monitor(\.debug)?|.*%%{_bindir}/iio_generic_buffer(\.debug)?|.*%%{_bindir}/lsiio(\.debug)?|.*%%{_bindir}/intel-speed-select(\.debug)?|.*%%{_bindir}/page_owner_sort(\.debug)?|.*%%{_bindir}/slabinfo(\.debug)?|.*%%{_sbindir}/intel_sdsi(\.debug)?|XXX' -o kernel-tools-debuginfo.list}
+%{expand:%%global _find_debuginfo_opts %{?_find_debuginfo_opts} -p '.*%%{_bindir}/centrino-decode(\.debug)?|.*%%{_bindir}/powernow-k8-decode(\.debug)?|.*%%{_bindir}/cpupower(\.debug)?|.*%%{_libdir}/libcpupower.*|.*%%{_bindir}/turbostat(\.debug)?|.*%%{_bindir}/x86_energy_perf_policy(\.debug)?|.*%%{_bindir}/tmon(\.debug)?|.*%%{_bindir}/lsgpio(\.debug)?|.*%%{_bindir}/gpio-hammer(\.debug)?|.*%%{_bindir}/gpio-event-mon(\.debug)?|.*%%{_bindir}/gpio-watch(\.debug)?|.*%%{_bindir}/iio_event_monitor(\.debug)?|.*%%{_bindir}/iio_generic_buffer(\.debug)?|.*%%{_bindir}/lsiio(\.debug)?|.*%%{_bindir}/intel-speed-select(\.debug)?|.*%%{_bindir}/page_owner_sort(\.debug)?|.*%%{_bindir}/slabinfo(\.debug)?|.*%%{_sbindir}/intel_sdsi(\.debug)?|XXX' -o %{package_name}-tools-debuginfo.list}

 %package -n rtla
 Summary: RTLA: Real-Time Linux Analysis tools
@ -1147,10 +1147,10 @@ Summary: gcov graph and source files for coverage data collection.
 kernel-gcov includes the gcov graph and source files for gcov coverage collection.
 %endif

-%package -n kernel-abi-stablelists
+%package -n %{package_name}-abi-stablelists
 Summary: The Red Hat Enterprise Linux kernel ABI symbol stablelists
 AutoReqProv: no
-%description -n kernel-abi-stablelists
+%description -n %{package_name}-abi-stablelists
 The kABI package contains information pertaining to the Red Hat Enterprise
 Linux kernel ABI, including lists of kernel symbols that are needed by
 external Linux kernel modules, and a yum plugin to aid enforcement.
@ -1224,8 +1224,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: kernel%{?1:-%{1}}-devel = %{version}-%{release}\
-Requires: kernel%{?1:-%{1}}-core = %{version}-%{release}\
+Requires: %{package_name}%{?1:-%{1}}-devel = %{version}-%{release}\
+Requires: %{package_name}%{?1:-%{1}}-core = %{version}-%{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}
@ -2867,10 +2867,10 @@ popd
 ###

 %if %{with_tools}
-%post -n kernel-tools-libs
+%post -n %{package_name}-tools-libs
 /sbin/ldconfig

-%postun -n kernel-tools-libs
+%postun -n %{package_name}-tools-libs
 /sbin/ldconfig
 %endif

@ -3098,7 +3098,7 @@ fi
 %endif

 %if %{with_kernel_abi_stablelists}
-%files -n kernel-abi-stablelists
+%files -n %{package_name}-abi-stablelists
 /lib/modules/kabi-*
 %endif

@ -3144,9 +3144,9 @@ fi

 %if %{with_tools}
 %ifnarch %{cpupowerarchs}
-%files -n kernel-tools
+%files -n %{package_name}-tools
 %else
-%files -n kernel-tools -f cpupower.lang
+%files -n %{package_name}-tools -f cpupower.lang
 %{_bindir}/cpupower
 %{_datadir}/bash-completion/completions/cpupower
 %ifarch x86_64
@ -3180,15 +3180,15 @@ fi
 %{_bindir}/slabinfo

 %if %{with_debuginfo}
-%files -f kernel-tools-debuginfo.list -n kernel-tools-debuginfo
+%files -f %{package_name}-tools-debuginfo.list -n %{package_name}-tools-debuginfo
 %endif

 %ifarch %{cpupowerarchs}
-%files -n kernel-tools-libs
+%files -n %{package_name}-tools-libs
 %{_libdir}/libcpupower.so.0
 %{_libdir}/libcpupower.so.0.0.1

-%files -n kernel-tools-libs-devel
+%files -n %{package_name}-tools-libs-devel
 %{_libdir}/libcpupower.so
 %{_includedir}/cpufreq.h
 %endif
@ -3360,6 +3360,13 @@ fi
 #
 #
 %changelog
+* Wed Mar 29 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.3.0-0.rc4.fcd476ea6a88.37]
+- redhat: kunit: cleanup NITRO config and enable rescale test (Nico Pache)
+- kernel.spec: use %%{package_name} to fix kernel-devel-matched Requires (Jan Stancek)
+- kernel.spec: use %%{package_name} also for abi-stablelist subpackages (Jan Stancek)
+- kernel.spec: use %%{package_name} also for tools subpackages (Jan Stancek)
+- Linux v6.3.0-0.rc4.fcd476ea6a88
+
 * Tue Mar 28 2023 Fedora Kernel Team <kernel-team@fedoraproject.org> [6.3.0-0.rc4.3a93e40326c8.36]
 - Linux v6.3.0-0.rc4.3a93e40326c8

--- a/6
+++ b/6
@ -1,3 +1,3 @@
-SHA512 (linux-6.3-rc4-25-g3a93e40326c8.tar.xz) = 3c36884c3c1b1834d3b305daf9e3f0d42fda0199de61b51021393e4783baceba84bf832cf085c09e99ceaab52b5c24275800ed5ab23d274064c2a9132d190e2f
-SHA512 (kernel-abi-stablelists-6.3.0.tar.bz2) = 803fb1aaeca16a6eb49ea30c05dafb7012f85f6782e26b361275f0fffae79f5beb1fe2bba7c54f43b0061696c0059a36636b6be61211a45a6afbd761c2dd40a2
-SHA512 (kernel-kabi-dw-6.3.0.tar.bz2) = 47815fb330a93bc972d027f982e02c5c5a05debc4ca0a7a10d568c84783ab342aff00edf4ce50f626b06271f08ae4777f301a039a894f5fdb93763f526203668
+SHA512 (linux-6.3-rc4-34-gfcd476ea6a88.tar.xz) = 1a547619b510c20a5f620a081e3536bad896e4c6df4a5dacfbcc769f4095c3e0a34807b23deeba4c78e45408ff31ad6cc38ef13fd42b6d1d14f1a4deb9be85aa
+SHA512 (kernel-abi-stablelists-6.3.0.tar.bz2) = 8e0514380a9ff60a7409f4a82580bf65fabc4611201c86be28547a05e1489ee8c842257fa75dcc74c6eb27420d619e28e1e9e1b78e9636f428f71b2b1da3662a
+SHA512 (kernel-kabi-dw-6.3.0.tar.bz2) = e4a0f04eb12c4459dc4f0f93ab0557ea457229006fa08a668ee2a30620b2cb1335c898ac99f615dc09cacb47283c3406398b6cb7b2b9ac6845b6ba8059e517bc