From f441c911c36904204952870fbc1c9b9054f4a114 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 30 Jun 2022 11:25:12 -0500 Subject: kernel-5.19.0-0.rc4.20220630gitd9b2ba67917c.35 * Thu Jun 30 2022 Fedora Kernel Team [5.19.0-0.rc4.d9b2ba67917c.34] - redhat/Makefile: Deprecate BUILD_SCRATCH_TARGET (Prarit Bhargava) - redhat: enable CONFIG_DEVTMPFS_SAFE (Mark Langsdorf) - redhat/Makefile: Remove deprecated variables and targets (Prarit Bhargava) - Split partner modules into a sub-package (Alice Mitchell) - Enable kAFS and it's dependancies in RHEL (Alice Mitchell) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- kernel-aarch64-debug-rhel.config | 13 +++++-- kernel-aarch64-rhel.config | 13 +++++-- kernel-ppc64le-debug-rhel.config | 13 +++++-- kernel-ppc64le-rhel.config | 13 +++++-- kernel-s390x-debug-rhel.config | 13 +++++-- kernel-s390x-rhel.config | 13 +++++-- kernel-s390x-zfcpdump-rhel.config | 13 +++++-- kernel-x86_64-debug-rhel.config | 13 +++++-- kernel-x86_64-rhel.config | 13 +++++-- kernel.spec | 71 +++++++++++++++++++++++++++++++++++++-- mod-partner.list | 2 ++ sources | 6 ++-- 13 files changed, 164 insertions(+), 34 deletions(-) create mode 100644 mod-partner.list diff --git a/Makefile.rhelver b/Makefile.rhelver index ccca41829..af759d5f9 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 = 34 +RHEL_RELEASE = 35 # # ZSTREAM diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 2a6bcb856..d24974f0a 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -163,8 +163,14 @@ CONFIG_ACPI=y # CONFIG_AFE4404 is not set # CONFIG_AFFS_FS is not set # CONFIG_AF_KCM is not set -# CONFIG_AF_RXRPC is not set -# CONFIG_AFS_FS is not set +CONFIG_AF_RXRPC_DEBUG=y +# CONFIG_AF_RXRPC_INJECT_LOSS is not set +CONFIG_AF_RXRPC_IPV6=y +CONFIG_AF_RXRPC=m +# CONFIG_AFS_DEBUG_CURSOR is not set +CONFIG_AFS_DEBUG=y +CONFIG_AFS_FSCACHE=y +CONFIG_AFS_FS=m # CONFIG_AGP is not set # CONFIG_AHCI_CEVA is not set # CONFIG_AHCI_QORIQ is not set @@ -1244,7 +1250,7 @@ CONFIG_DEV_DAX_PMEM=m CONFIG_DEVMEM=y # CONFIG_DEVPORT is not set CONFIG_DEVTMPFS_MOUNT=y -# CONFIG_DEVTMPFS_SAFE is not set +CONFIG_DEVTMPFS_SAFE=y CONFIG_DEVTMPFS=y # CONFIG_DHT11 is not set CONFIG_DIMLIB=y @@ -4787,6 +4793,7 @@ CONFIG_RTW89_DEBUGFS=y CONFIG_RTW89_DEBUGMSG=y CONFIG_RTW89=m CONFIG_RUNTIME_TESTING_MENU=y +CONFIG_RXKAD=y # CONFIG_S390_KPROBES_SANITY_TEST is not set # CONFIG_S390_MODULES_SANITY_TEST is not set # CONFIG_SAMPLES is not set diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 8d10de4ab..5d67d2188 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -163,8 +163,14 @@ CONFIG_ACPI=y # CONFIG_AFE4404 is not set # CONFIG_AFFS_FS is not set # CONFIG_AF_KCM is not set -# CONFIG_AF_RXRPC is not set -# CONFIG_AFS_FS is not set +CONFIG_AF_RXRPC_DEBUG=y +# CONFIG_AF_RXRPC_INJECT_LOSS is not set +CONFIG_AF_RXRPC_IPV6=y +CONFIG_AF_RXRPC=m +# CONFIG_AFS_DEBUG_CURSOR is not set +CONFIG_AFS_DEBUG=y +CONFIG_AFS_FSCACHE=y +CONFIG_AFS_FS=m # CONFIG_AGP is not set # CONFIG_AHCI_CEVA is not set # CONFIG_AHCI_QORIQ is not set @@ -1236,7 +1242,7 @@ CONFIG_DEV_DAX_PMEM=m # CONFIG_DEVMEM is not set # CONFIG_DEVPORT is not set CONFIG_DEVTMPFS_MOUNT=y -# CONFIG_DEVTMPFS_SAFE is not set +CONFIG_DEVTMPFS_SAFE=y CONFIG_DEVTMPFS=y # CONFIG_DHT11 is not set CONFIG_DIMLIB=y @@ -4764,6 +4770,7 @@ CONFIG_RTW89_8852AE=m # CONFIG_RTW89_DEBUGMSG is not set CONFIG_RTW89=m CONFIG_RUNTIME_TESTING_MENU=y +CONFIG_RXKAD=y # CONFIG_S390_KPROBES_SANITY_TEST is not set # CONFIG_S390_MODULES_SANITY_TEST is not set # CONFIG_SAMPLES is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index 2e9079b76..ef0d5500a 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -158,8 +158,14 @@ CONFIG_ACPI_THERMAL=y # CONFIG_AFE4404 is not set # CONFIG_AFFS_FS is not set # CONFIG_AF_KCM is not set -# CONFIG_AF_RXRPC is not set -# CONFIG_AFS_FS is not set +CONFIG_AF_RXRPC_DEBUG=y +# CONFIG_AF_RXRPC_INJECT_LOSS is not set +CONFIG_AF_RXRPC_IPV6=y +CONFIG_AF_RXRPC=m +# CONFIG_AFS_DEBUG_CURSOR is not set +CONFIG_AFS_DEBUG=y +CONFIG_AFS_FSCACHE=y +CONFIG_AFS_FS=m # CONFIG_AGP is not set # CONFIG_AHCI_CEVA is not set # CONFIG_AHCI_QORIQ is not set @@ -1093,7 +1099,7 @@ CONFIG_DEVICE_PRIVATE=y CONFIG_DEVMEM=y # CONFIG_DEVPORT is not set CONFIG_DEVTMPFS_MOUNT=y -# CONFIG_DEVTMPFS_SAFE is not set +CONFIG_DEVTMPFS_SAFE=y CONFIG_DEVTMPFS=y # CONFIG_DHT11 is not set CONFIG_DIMLIB=y @@ -4567,6 +4573,7 @@ CONFIG_RTW89_DEBUGFS=y CONFIG_RTW89_DEBUGMSG=y CONFIG_RTW89=m CONFIG_RUNTIME_TESTING_MENU=y +CONFIG_RXKAD=y # CONFIG_S390_KPROBES_SANITY_TEST is not set # CONFIG_S390_MODULES_SANITY_TEST is not set # CONFIG_SAMPLES is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index 607edcbee..cf9b9551d 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -158,8 +158,14 @@ CONFIG_ACPI_THERMAL=y # CONFIG_AFE4404 is not set # CONFIG_AFFS_FS is not set # CONFIG_AF_KCM is not set -# CONFIG_AF_RXRPC is not set -# CONFIG_AFS_FS is not set +CONFIG_AF_RXRPC_DEBUG=y +# CONFIG_AF_RXRPC_INJECT_LOSS is not set +CONFIG_AF_RXRPC_IPV6=y +CONFIG_AF_RXRPC=m +# CONFIG_AFS_DEBUG_CURSOR is not set +CONFIG_AFS_DEBUG=y +CONFIG_AFS_FSCACHE=y +CONFIG_AFS_FS=m # CONFIG_AGP is not set # CONFIG_AHCI_CEVA is not set # CONFIG_AHCI_QORIQ is not set @@ -1085,7 +1091,7 @@ CONFIG_DEVICE_PRIVATE=y CONFIG_DEVMEM=y # CONFIG_DEVPORT is not set CONFIG_DEVTMPFS_MOUNT=y -# CONFIG_DEVTMPFS_SAFE is not set +CONFIG_DEVTMPFS_SAFE=y CONFIG_DEVTMPFS=y # CONFIG_DHT11 is not set CONFIG_DIMLIB=y @@ -4546,6 +4552,7 @@ CONFIG_RTW89_8852AE=m # CONFIG_RTW89_DEBUGMSG is not set CONFIG_RTW89=m CONFIG_RUNTIME_TESTING_MENU=y +CONFIG_RXKAD=y # CONFIG_S390_KPROBES_SANITY_TEST is not set # CONFIG_S390_MODULES_SANITY_TEST is not set # CONFIG_SAMPLES is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index 305b039ca..353a37217 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -158,8 +158,14 @@ CONFIG_ACPI_THERMAL=y # CONFIG_AFFS_FS is not set CONFIG_AFIUCV=m # CONFIG_AF_KCM is not set -# CONFIG_AF_RXRPC is not set -# CONFIG_AFS_FS is not set +CONFIG_AF_RXRPC_DEBUG=y +# CONFIG_AF_RXRPC_INJECT_LOSS is not set +CONFIG_AF_RXRPC_IPV6=y +CONFIG_AF_RXRPC=m +# CONFIG_AFS_DEBUG_CURSOR is not set +CONFIG_AFS_DEBUG=y +CONFIG_AFS_FSCACHE=y +CONFIG_AFS_FS=m # CONFIG_AGP is not set CONFIG_AIO=y # CONFIG_AIX_PARTITION is not set @@ -1098,7 +1104,7 @@ CONFIG_DEV_DAX_PMEM=m CONFIG_DEVMEM=y # CONFIG_DEVPORT is not set CONFIG_DEVTMPFS_MOUNT=y -# CONFIG_DEVTMPFS_SAFE is not set +CONFIG_DEVTMPFS_SAFE=y CONFIG_DEVTMPFS=y # CONFIG_DHT11 is not set CONFIG_DIAG288_WATCHDOG=m @@ -4505,6 +4511,7 @@ CONFIG_RTW89_DEBUGFS=y CONFIG_RTW89_DEBUGMSG=y CONFIG_RTW89=m CONFIG_RUNTIME_TESTING_MENU=y +CONFIG_RXKAD=y CONFIG_S390_AP_IOMMU=y CONFIG_S390_CCW_IOMMU=y CONFIG_S390_GUEST=y diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index 6872dbe36..f11e615e5 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -158,8 +158,14 @@ CONFIG_ACPI_THERMAL=y # CONFIG_AFFS_FS is not set CONFIG_AFIUCV=m # CONFIG_AF_KCM is not set -# CONFIG_AF_RXRPC is not set -# CONFIG_AFS_FS is not set +CONFIG_AF_RXRPC_DEBUG=y +# CONFIG_AF_RXRPC_INJECT_LOSS is not set +CONFIG_AF_RXRPC_IPV6=y +CONFIG_AF_RXRPC=m +# CONFIG_AFS_DEBUG_CURSOR is not set +CONFIG_AFS_DEBUG=y +CONFIG_AFS_FSCACHE=y +CONFIG_AFS_FS=m # CONFIG_AGP is not set CONFIG_AIO=y # CONFIG_AIX_PARTITION is not set @@ -1090,7 +1096,7 @@ CONFIG_DEV_DAX_PMEM=m CONFIG_DEVMEM=y # CONFIG_DEVPORT is not set CONFIG_DEVTMPFS_MOUNT=y -# CONFIG_DEVTMPFS_SAFE is not set +CONFIG_DEVTMPFS_SAFE=y CONFIG_DEVTMPFS=y # CONFIG_DHT11 is not set CONFIG_DIAG288_WATCHDOG=m @@ -4484,6 +4490,7 @@ CONFIG_RTW89_8852AE=m # CONFIG_RTW89_DEBUGMSG is not set CONFIG_RTW89=m CONFIG_RUNTIME_TESTING_MENU=y +CONFIG_RXKAD=y CONFIG_S390_AP_IOMMU=y CONFIG_S390_CCW_IOMMU=y CONFIG_S390_GUEST=y diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index b9f5a6dec..9cb36e4b2 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -158,8 +158,14 @@ CONFIG_ACPI_THERMAL=y # CONFIG_AFFS_FS is not set # CONFIG_AFIUCV is not set # CONFIG_AF_KCM is not set -# CONFIG_AF_RXRPC is not set -# CONFIG_AFS_FS is not set +CONFIG_AF_RXRPC_DEBUG=y +# CONFIG_AF_RXRPC_INJECT_LOSS is not set +CONFIG_AF_RXRPC_IPV6=y +CONFIG_AF_RXRPC=m +# CONFIG_AFS_DEBUG_CURSOR is not set +CONFIG_AFS_DEBUG=y +CONFIG_AFS_FSCACHE=y +CONFIG_AFS_FS=m # CONFIG_AGP is not set CONFIG_AIO=y # CONFIG_AIX_PARTITION is not set @@ -1095,7 +1101,7 @@ CONFIG_DEV_DAX_PMEM=m CONFIG_DEVMEM=y # CONFIG_DEVPORT is not set CONFIG_DEVTMPFS_MOUNT=y -# CONFIG_DEVTMPFS_SAFE is not set +CONFIG_DEVTMPFS_SAFE=y CONFIG_DEVTMPFS=y # CONFIG_DHT11 is not set CONFIG_DIAG288_WATCHDOG=m @@ -4500,6 +4506,7 @@ CONFIG_RTW89_8852AE=m # CONFIG_RTW89_DEBUGMSG is not set CONFIG_RTW89=m CONFIG_RUNTIME_TESTING_MENU=y +CONFIG_RXKAD=y CONFIG_S390_AP_IOMMU=y CONFIG_S390_CCW_IOMMU=y # CONFIG_S390_GUEST is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index 7be26f21f..d8cd52bc4 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -175,8 +175,14 @@ CONFIG_ACPI=y # CONFIG_AFE4404 is not set # CONFIG_AFFS_FS is not set # CONFIG_AF_KCM is not set -# CONFIG_AF_RXRPC is not set -# CONFIG_AFS_FS is not set +CONFIG_AF_RXRPC_DEBUG=y +# CONFIG_AF_RXRPC_INJECT_LOSS is not set +CONFIG_AF_RXRPC_IPV6=y +CONFIG_AF_RXRPC=m +# CONFIG_AFS_DEBUG_CURSOR is not set +CONFIG_AFS_DEBUG=y +CONFIG_AFS_FSCACHE=y +CONFIG_AFS_FS=m # CONFIG_AGP is not set CONFIG_AIO=y # CONFIG_AIX_PARTITION is not set @@ -1168,7 +1174,7 @@ CONFIG_DEVICE_PRIVATE=y CONFIG_DEVMEM=y CONFIG_DEVPORT=y CONFIG_DEVTMPFS_MOUNT=y -# CONFIG_DEVTMPFS_SAFE is not set +CONFIG_DEVTMPFS_SAFE=y CONFIG_DEVTMPFS=y # CONFIG_DHT11 is not set CONFIG_DIMLIB=y @@ -4736,6 +4742,7 @@ CONFIG_RTW89_DEBUGFS=y CONFIG_RTW89_DEBUGMSG=y CONFIG_RTW89=m CONFIG_RUNTIME_TESTING_MENU=y +CONFIG_RXKAD=y # CONFIG_S390_KPROBES_SANITY_TEST is not set # CONFIG_S390_MODULES_SANITY_TEST is not set # CONFIG_SAMPLE_ANDROID_BINDERFS is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index d83fb154f..d526a494c 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -175,8 +175,14 @@ CONFIG_ACPI=y # CONFIG_AFE4404 is not set # CONFIG_AFFS_FS is not set # CONFIG_AF_KCM is not set -# CONFIG_AF_RXRPC is not set -# CONFIG_AFS_FS is not set +CONFIG_AF_RXRPC_DEBUG=y +# CONFIG_AF_RXRPC_INJECT_LOSS is not set +CONFIG_AF_RXRPC_IPV6=y +CONFIG_AF_RXRPC=m +# CONFIG_AFS_DEBUG_CURSOR is not set +CONFIG_AFS_DEBUG=y +CONFIG_AFS_FSCACHE=y +CONFIG_AFS_FS=m # CONFIG_AGP is not set CONFIG_AIO=y # CONFIG_AIX_PARTITION is not set @@ -1160,7 +1166,7 @@ CONFIG_DEVICE_PRIVATE=y CONFIG_DEVMEM=y CONFIG_DEVPORT=y CONFIG_DEVTMPFS_MOUNT=y -# CONFIG_DEVTMPFS_SAFE is not set +CONFIG_DEVTMPFS_SAFE=y CONFIG_DEVTMPFS=y # CONFIG_DHT11 is not set CONFIG_DIMLIB=y @@ -4714,6 +4720,7 @@ CONFIG_RTW89_8852AE=m # CONFIG_RTW89_DEBUGMSG is not set CONFIG_RTW89=m CONFIG_RUNTIME_TESTING_MENU=y +CONFIG_RXKAD=y # CONFIG_S390_KPROBES_SANITY_TEST is not set # CONFIG_S390_MODULES_SANITY_TEST is not set # CONFIG_SAMPLE_ANDROID_BINDERFS is not set diff --git a/kernel.spec b/kernel.spec index 8faad4631..22a28aeaa 100755 --- a/kernel.spec +++ b/kernel.spec @@ -124,13 +124,13 @@ Summary: The Linux kernel # define buildid .local %define specversion 5.19.0 %define patchversion 5.19 -%define pkgrelease 0.rc4.20220628git941e3e791269.34 +%define pkgrelease 0.rc4.20220630gitd9b2ba67917c.35 %define kversion 5 -%define tarfile_release 5.19-rc4-14-g941e3e791269 +%define tarfile_release 5.19-rc4-36-gd9b2ba67917c # This is needed to do merge window version magic %define patchlevel 19 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc4.20220628git941e3e791269.34%{?buildid}%{?dist} +%define specrelease 0.rc4.20220630gitd9b2ba67917c.35%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 5.19.0 @@ -815,6 +815,7 @@ Source81: process_configs.sh Source82: update_scripts.sh Source84: mod-internal.list +Source85: mod-partner.list Source100: rheldup3.x509 Source101: rhelkpatch1.x509 @@ -1279,10 +1280,34 @@ Requires: kernel-core-uname-r = %{KVERREL}\ %{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*}}}\ +%if 0%{!?fedora:1}\ +%{expand:%%kernel_modules_partner_package %{?1:%{1}} %{!?{-n}:%{1}}%{?{-n}:%{-n*}}}\ +%endif\ %{expand:%%kernel_debuginfo_package %{?1:%{1}}}\ %endif\ %{nil} +# +# This macro creates a kernel--modules-partner package. +# %%kernel_modules_partner_package +# +%define kernel_modules_partner_package() \ +%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: 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}}\ +AutoReq: no\ +AutoProv: yes\ +%description %{?1:%{1}-}modules-partner\ +This package provides kernel modules for the %{?2:%{2} }kernel package for Red Hat partners usage.\ +%{nil} + # Now, each variant package. %if %{with_pae} @@ -2041,6 +2066,10 @@ BuildKernel() { %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer $(realpath configs/mod-extra.list) # Identify modules in the kernel-modules-extras package %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer %{SOURCE84} internal +%if 0%{!?fedora:1} + # Identify modules in the kernel-modules-partner package + %{SOURCE20} $RPM_BUILD_ROOT lib/modules/$KernelVer %{SOURCE85} partner +%endif # # Generate the kernel-core and kernel-modules files lists @@ -2058,6 +2087,10 @@ BuildKernel() { xargs rm -rf < mod-extra.list # don't include anything going int kernel-modules-internal in the file lists xargs rm -rf < mod-internal.list +%if 0%{!?fedora:1} + # don't include anything going int kernel-modules-partner in the file lists + xargs rm -rf < mod-partner.list +%endif if [ $DoModules -eq 1 ]; then # Find all the module files and filter them out into the core and @@ -2113,6 +2146,9 @@ BuildKernel() { sed -e 's/^lib*/\/lib/' %{?zipsed} $RPM_BUILD_ROOT/modules.list >> ../kernel${Variant:+-${Variant}}-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} + sed -e 's/^lib*/\/lib/' %{?zipsed} $RPM_BUILD_ROOT/mod-partner.list >> ../kernel${Variant:+-${Variant}}-modules-partner.list +%endif # Cleanup rm -f $RPM_BUILD_ROOT/k-d.list @@ -2120,6 +2156,9 @@ BuildKernel() { rm -f $RPM_BUILD_ROOT/module-dirs.list rm -f $RPM_BUILD_ROOT/mod-extra.list rm -f $RPM_BUILD_ROOT/mod-internal.list +%if 0%{!?fedora:1} + rm -f $RPM_BUILD_ROOT/mod-partner.list +%endif %if %{signmodules} if [ $DoModules -eq 1 ]; then @@ -2698,6 +2737,19 @@ fi\ /sbin/depmod -a %{KVERREL}%{?1:+%{1}}\ %{nil} +# +# This macro defines a %%post script for a kernel*-modules-partner package. +# It also defines a %%postun script that does the same thing. +# %%kernel_modules_partner_post [] +# +%define kernel_modules_partner_post() \ +%{expand:%%post %{?1:%{1}-}modules-partner}\ +/sbin/depmod -a %{KVERREL}%{?1:+%{1}}\ +%{nil}\ +%{expand:%%postun %{?1:%{1}-}modules-partner}\ +/sbin/depmod -a %{KVERREL}%{?1:+%{1}}\ +%{nil} + # # This macro defines a %%post script for a kernel*-modules package. # It also defines a %%postun script that does the same thing. @@ -2748,6 +2800,9 @@ rm -f %{_localstatedir}/lib/rpm-state/%{name}/installing_core_%{KVERREL}%{?1:+%{ %{expand:%%kernel_modules_post %{?-v*}}\ %{expand:%%kernel_modules_extra_post %{?-v*}}\ %{expand:%%kernel_modules_internal_post %{?-v*}}\ +%if 0%{!?fedora:1}\ +%{expand:%%kernel_modules_partner_post %{?-v*}}\ +%endif\ %{expand:%%kernel_variant_posttrans %{?-v*}}\ %{expand:%%post %{?-v*:%{-v*}-}core}\ %{-r:\ @@ -3000,6 +3055,9 @@ fi %{expand:%%files -f kernel-%{?3:%{3}-}modules-extra.list %{?3:%{3}-}modules-extra}\ %config(noreplace) /etc/modprobe.d/*-blacklist.conf\ %{expand:%%files -f kernel-%{?3:%{3}-}modules-internal.list %{?3:%{3}-}modules-internal}\ +%if 0%{!?fedora:1}\ +%{expand:%%files -f kernel-%{?3:%{3}-}modules-partner.list %{?3:%{3}-}modules-partner}\ +%endif\ %if %{with_debuginfo}\ %ifnarch noarch\ %{expand:%%files -f debuginfo%{?3}.list %{?3:%{3}-}debuginfo}\ @@ -3042,6 +3100,13 @@ fi # # %changelog +* Thu Jun 30 2022 Fedora Kernel Team [5.19.0-0.rc4.d9b2ba67917c.34] +- redhat/Makefile: Deprecate BUILD_SCRATCH_TARGET (Prarit Bhargava) +- redhat: enable CONFIG_DEVTMPFS_SAFE (Mark Langsdorf) +- redhat/Makefile: Remove deprecated variables and targets (Prarit Bhargava) +- Split partner modules into a sub-package (Alice Mitchell) +- Enable kAFS and it's dependancies in RHEL (Alice Mitchell) + * Tue Jun 28 2022 Fedora Kernel Team [5.19.0-0.rc4.941e3e791269.33] - Enable Marvell OcteonTX2 crypto device in ARK (Vladis Dronov) - redhat/Makefile: Remove --scratch from BUILD_TARGET (Prarit Bhargava) diff --git a/mod-partner.list b/mod-partner.list new file mode 100644 index 000000000..9cd36e549 --- /dev/null +++ b/mod-partner.list @@ -0,0 +1,2 @@ +afs +rxrpc diff --git a/sources b/sources index 5c698c6f9..d3a87df07 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.19-rc4-14-g941e3e791269.tar.xz) = f74792650935a6c984e844417148416c14fef09b4fb0257bef9412dacc8ec327e61cd27f7835a1cda30607ca0ff2101a45b99f083ea4a6c34da79d788eca8d81 -SHA512 (kernel-abi-stablelists-5.19.0.tar.bz2) = 1b81ba94da5e77289ca934abff503bd9fd03e0695c1206d2e2cc334761452938373753ffeff12ebbeca312f78b5cc4b59db086e92e47cdd97b109c3694eabee0 -SHA512 (kernel-kabi-dw-5.19.0.tar.bz2) = f2a2315ea007e508acfaa6c29d6b33dcbacb3f567165efd3f1e85132a168b799150638bac144316d89dc8f226ed71898b8654177218ef7170b1fa978753eaca5 +SHA512 (linux-5.19-rc4-36-gd9b2ba67917c.tar.xz) = f82aba2eb2ba8cc01ed759dda8286f3f41ff99402175c670d17cfb2f28eafd2bdd49b9978bee65455ad231d121daa92fc315d915a0de906de74eb9f7f4f0f167 +SHA512 (kernel-abi-stablelists-5.19.0.tar.bz2) = b884271526967b9441d4b46222bfc649bed9ca251cdd3de3a2112c69cfffabc51b519e2b5c8b536639bd90f7a6cacef934c7f9c2b85040871d89852f20f312a1 +SHA512 (kernel-kabi-dw-5.19.0.tar.bz2) = 2bf3a66114d6132f75cc344a06005f67e46dda7b7bcc35249539b800fd65ed943f1011656f167a63a9e0848ceaa8d5ef4611170999e96052ba08b16c63623c0c -- cgit