From 75aca9d44e26a3320473ba9f868a79c82cc20d1f Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 19 Jan 2023 11:03:38 -0600 Subject: kernel-6.2.0-0.rc4.20230119git7287904c8771.34 * Thu Jan 19 2023 Fedora Kernel Team [6.2.0-0.rc4.7287904c8771.34] - Revert "redhat: fix elf got hardening for vm tools" (Don Zickus) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel.spec | 69 +++++++++++++++++++++++++++++++++++++++++++++++++------- sources | 6 ++--- 3 files changed, 65 insertions(+), 12 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 1c25bd071..ccca41829 100644 --- 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 = 33 +RHEL_RELEASE = 34 # # ZSTREAM diff --git a/kernel.spec b/kernel.spec index 6dedacb89..2b93dce6b 100755 --- a/kernel.spec +++ b/kernel.spec @@ -126,13 +126,13 @@ Summary: The Linux kernel # define buildid .local %define specversion 6.2.0 %define patchversion 6.2 -%define pkgrelease 0.rc4.20230118gitc1649ec55708.33 +%define pkgrelease 0.rc4.20230119git7287904c8771.34 %define kversion 6 -%define tarfile_release 6.2-rc4-41-gc1649ec55708 +%define tarfile_release 6.2-rc4-67-g7287904c8771 # This is needed to do merge window version magic %define patchlevel 2 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.20230118gitc1649ec55708.33%{?buildid}%{?dist} +%define specrelease 0.rc4.20230119git7287904c8771.34%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 6.2.0 @@ -571,6 +571,7 @@ ExclusiveOS: Linux %ifnarch %{nobuildarches} Requires: kernel-core-uname-r = %{KVERREL} Requires: kernel-modules-uname-r = %{KVERREL} +Requires: kernel-modules-core-uname-r = %{KVERREL} %endif @@ -886,6 +887,7 @@ Provides: kernel = %{specversion}-%{pkg_release}\ %endif\ Provides: kernel-%{_target_cpu} = %{specversion}-%{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}\ Requires(pre): %{initrd_prereq}\ Requires(pre): ((linux-firmware >= 20150904-56.git6ebf5d57) if linux-firmware)\ @@ -1208,6 +1210,7 @@ Provides: installonlypkg(kernel-module)\ Provides: kernel%{?1:-%{1}}-modules-internal-uname-r = %{KVERREL}%{?1:+%{1}}\ Requires: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\ Requires: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?1:+%{1}}\ +Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\ AutoReq: no\ AutoProv: yes\ %description %{?1:%{1}-}modules-internal\ @@ -1228,6 +1231,7 @@ Provides: installonlypkg(kernel-module)\ Provides: kernel%{?1:-%{1}}-modules-extra-uname-r = %{KVERREL}%{?1:+%{1}}\ Requires: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\ Requires: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?1:+%{1}}\ +Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\ %if %{-m:1}%{!-m:0}\ Requires: kernel-modules-extra-uname-r = %{KVERREL}\ %endif\ @@ -1250,6 +1254,7 @@ Provides: kernel-modules = %{version}-%{release}%{?1:+%{1}}\ Provides: installonlypkg(kernel-module)\ Provides: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?1:+%{1}}\ Requires: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\ +Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\ %if %{-m:1}%{!-m:0}\ Requires: kernel-modules-uname-r = %{KVERREL}\ %endif\ @@ -1259,6 +1264,28 @@ AutoProv: yes\ This package provides commonly used kernel modules for the %{?2:%{2}-}core kernel package.\ %{nil} +# +# This macro creates a kernel--modules-core package. +# %%kernel_modules_core_package [-m] +# +%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: installonlypkg(kernel-module)\ +Provides: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\ +Requires: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\ +%if %{-m:1}%{!-m:0}\ +Requires: kernel-modules-core-uname-r = %{KVERREL}\ +%endif\ +AutoReq: no\ +AutoProv: yes\ +%description %{?1:%{1}-}modules-core\ +This package provides essential kernel modules for the %{?2:%{2}-}core kernel package.\ +%{nil} + # # this macro creates a kernel- meta package. # %%kernel_meta_package @@ -1268,6 +1295,7 @@ This package provides commonly used kernel modules for the %{?2:%{2}-}core kerne summary: kernel meta-package for the %{1} kernel\ Requires: kernel-%{1}-core-uname-r = %{KVERREL}+%{1}\ Requires: kernel-%{1}-modules-uname-r = %{KVERREL}+%{1}\ +Requires: kernel-%{1}-modules-core-uname-r = %{KVERREL}+%{1}\ Provides: installonlypkg(kernel)\ %description %{1}\ The meta-package for the %{1} kernel\ @@ -1285,6 +1313,7 @@ Provides: kernel-%{?1:%{1}-}core-uname-r = %{KVERREL}%{?1:+%{1}}\ Provides: installonlypkg(kernel)\ %if %{-m:1}%{!-m:0}\ Requires: kernel-core-uname-r = %{KVERREL}\ +Requires: kernel-%{?1:%{1}-}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\ %endif\ %{expand:%%kernel_reqprovconf %{?1:%{1}} %{-o:%{-o}}}\ %if %{?1:1} %{!?1:0} \ @@ -1293,6 +1322,7 @@ Requires: kernel-core-uname-r = %{KVERREL}\ %{expand:%%kernel_devel_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}} %{-m:%{-m}}}\ %{expand:%%kernel_devel_matched_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}} %{-m:%{-m}}}\ %{expand:%%kernel_modules_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}} %{-m:%{-m}}}\ +%{expand:%%kernel_modules_core_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}} %{-m:%{-m}}}\ %{expand:%%kernel_modules_extra_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}} %{-m:%{-m}}}\ %if %{-m:0}%{!-m:1}\ %{expand:%%kernel_modules_internal_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}}}\ @@ -1318,6 +1348,7 @@ Provides: installonlypkg(kernel-module)\ Provides: kernel%{?1:-%{1}}-modules-partner-uname-r = %{KVERREL}%{?1:+%{1}}\ Requires: kernel-uname-r = %{KVERREL}%{?1:+%{1}}\ Requires: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{?1:+%{1}}\ +Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{?1:+%{1}}\ AutoReq: no\ AutoProv: yes\ %description %{?1:%{1}-}modules-partner\ @@ -2171,8 +2202,8 @@ BuildKernel() { # Make sure the files lists start with absolute paths or rpmbuild fails. # Also add in the dir entries sed -e 's/^lib*/\/lib/' %{?zipsed} $RPM_BUILD_ROOT/k-d.list > ../kernel${Variant:+-${Variant}}-modules.list - sed -e 's/^lib*/%dir \/lib/' %{?zipsed} $RPM_BUILD_ROOT/module-dirs.list > ../kernel${Variant:+-${Variant}}-core.list - sed -e 's/^lib*/\/lib/' %{?zipsed} $RPM_BUILD_ROOT/modules.list >> ../kernel${Variant:+-${Variant}}-core.list + sed -e 's/^lib*/%dir \/lib/' %{?zipsed} $RPM_BUILD_ROOT/module-dirs.list > ../kernel${Variant:+-${Variant}}-modules-core.list + sed -e 's/^lib*/\/lib/' %{?zipsed} $RPM_BUILD_ROOT/modules.list >> ../kernel${Variant:+-${Variant}}-modules-core.list sed -e 's/^lib*/\/lib/' %{?zipsed} $RPM_BUILD_ROOT/mod-extra.list >> ../kernel${Variant:+-${Variant}}-modules-extra.list sed -e 's/^lib*/\/lib/' %{?zipsed} $RPM_BUILD_ROOT/mod-internal.list >> ../kernel${Variant:+-${Variant}}-modules-internal.list %if 0%{!?fedora:1} @@ -2837,6 +2868,19 @@ if [ -f %{_localstatedir}/lib/rpm-state/%{name}/need_to_run_dracut_%{KVERREL}%{? fi\ %{nil} +# +# This macro defines a %%post script for a kernel*-modules-core package. +# It also defines a %%postun script that does the same thing. +# %%kernel_modules_core_post [] +# +%define kernel_modules_core_post() \ +%{expand:%%posttrans %{?1:%{1}-}modules-core}\ +/sbin/depmod -a %{KVERREL}%{?1:+%{1}}\ +%{nil}\ +%{expand:%%postun %{?1:%{1}-}modules-core}\ +/sbin/depmod -a %{KVERREL}%{?1:+%{1}}\ +%{nil} + # This macro defines a %%posttrans script for a kernel package. # %%kernel_variant_posttrans [] # More text can follow to go at the end of this variant's %%post. @@ -2865,6 +2909,7 @@ fi\ %define kernel_variant_post(v:r:) \ %{expand:%%kernel_devel_post %{?-v*}}\ %{expand:%%kernel_modules_post %{?-v*}}\ +%{expand:%%kernel_modules_core_post %{?-v*}}\ %{expand:%%kernel_modules_extra_post %{?-v*}}\ %{expand:%%kernel_modules_internal_post %{?-v*}}\ %if 0%{!?fedora:1}\ @@ -3095,7 +3140,7 @@ fi # %define kernel_variant_files(k:) \ %if %{2}\ -%{expand:%%files -f kernel-%{?3:%{3}-}core.list %{?1:-f kernel-%{?3:%{3}-}ldsoconf.list} %{?3:%{3}-}core}\ +%{expand:%%files %{?1:-f kernel-%{?3:%{3}-}ldsoconf.list} %{?3:%{3}-}core}\ %{!?_licensedir:%global license %%doc}\ %license linux-%{KVERREL}/COPYING-%{version}-%{release}\ /lib/modules/%{KVERREL}%{?3:+%{3}}/%{?-k:%{-k*}}%{!?-k:vmlinuz}\ @@ -3113,6 +3158,7 @@ fi %ghost %attr(0600, root, root) /boot/symvers-%{KVERREL}%{?3:+%{3}}.gz\ %ghost %attr(0600, root, root) /boot/initramfs-%{KVERREL}%{?3:+%{3}}.img\ %ghost %attr(0644, root, root) /boot/config-%{KVERREL}%{?3:+%{3}}\ +%{expand:%%files -f kernel-%{?3:%{3}-}modules-core.list %{?3:%{3}-}modules-core}\ %dir /lib/modules\ %dir /lib/modules/%{KVERREL}%{?3:+%{3}}\ %dir /lib/modules/%{KVERREL}%{?3:+%{3}}/kernel\ @@ -3156,6 +3202,7 @@ fi %files debug-devel %files debug-devel-matched %files debug-modules +%files debug-modules-core %files debug-modules-extra %endif %kernel_variant_files %{use_vdso} %{with_pae} lpae @@ -3179,10 +3226,16 @@ fi # # %changelog -* Wed Jan 18 2023 Fedora Kernel Team [6.2.0-0.rc4.c1649ec55708.33] -- Turn off CONFIG_MTK_T7XX for S390x (Justin M. Forbes) +* Thu Jan 19 2023 Fedora Kernel Team [6.2.0-0.rc4.7287904c8771.34] - Revert "redhat: fix elf got hardening for vm tools" (Don Zickus) +* Thu Jan 19 2023 Fedora Kernel Team [6.2.0-0.rc4.7287904c8771.33] +- modules-core: use %%posttrans (Gerd Hoffmann) +- split sub-rpm kernel-modules-core from kernel-core (Gerd Hoffmann) +- Turn off CONFIG_MTK_T7XX for S390x (Justin M. Forbes) +- CI: add variable for variant handling (Veronika Kabatova) +- Linux v6.2.0-0.rc4.7287904c8771 + * Wed Jan 18 2023 Fedora Kernel Team [6.2.0-0.rc4.c1649ec55708.32] - Fix up configs with SND_SOC_NAU8315 mismatch (Justin M. Forbes) - Linux v6.2.0-0.rc4.c1649ec55708 diff --git a/sources b/sources index 4fc1edea4..cd089fc75 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-6.2-rc4-41-gc1649ec55708.tar.xz) = bc7a4c0db5eb915d983cb05b8ef792acdba2060778bd05b37d2f9633daac85ffcf7d20e6bf230bd5a15da0bb32e4c6e09eba8130c7b89e65598868f5de8b9fc8 -SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = f36727e16766954863c80272ca2713c1c9aa8f37d1a3bdd06dc36280e548cd9ee163eb663fccd39d2e388c68c60f42c905fe913671b18f6e01dd24d5c0c0b6b5 -SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = a2ae4aa3fcf5f7f888399bde635a229df92dafe60b8ad010c7446f39ecfe703518f5d2d179abe8fcfd1687bc3724ef4808676c174a4eea575f55698e70a06d81 +SHA512 (linux-6.2-rc4-67-g7287904c8771.tar.xz) = 21ba74d41fb501553995b00a12a8691cac881a7da5c47f04a4204930216761b5c425a5064d087c89ef796d02e6016297af1c4c8550be3c2d0acba1330c30b0a3 +SHA512 (kernel-abi-stablelists-6.2.0.tar.bz2) = 5f34604fc0dce1f93b89ab60a2fb0885fa1d9a70c1dd179dcbf82d1cf82d2c22199e4cd1e441c5e1818a32e1bd4080195858f0dd4d7b7d9f129776029ef35914 +SHA512 (kernel-kabi-dw-6.2.0.tar.bz2) = e72f2febb6cefd9c9b813c024d3e5bf41197c759500f021578ae9fae9b83e9128f272e01529f9fa59788a483549ceadeb7d54c7af41cb32382f0a533ae51b9b9 -- cgit