Merge: Enable kAFS and it's dependancies in RHEL

Herton R. Krzesinski · Herton R. Krzesinski · commit 89e1f9c08cbb · 2023-02-15T18:58:12.000Z
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/1950 ## Summary of Changes This enables the partner supported AFS module and it's dependencies in RHEL and splits the built components out into a sub-package as per policy. Previously accepted into kernel-ark as [PR 1784](https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1784) Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2039020 Jira: https://issues.redhat.com/browse/RHELPLAN-107323 Upstream Status: RHEL only Signed-off-by: Alice Mitchell <ajmitchell@redhat.com> Approved-by: Marc Dionne <mdionne@redhat.com> Approved-by: Herton R. Krzesinski <herton@redhat.com> Signed-off-by: Herton R. Krzesinski <herton@redhat.com>
diff --git a/redhat/Makefile b/redhat/Makefile
@@ -636,6 +636,7 @@ sources-rh: $(TARBALL) generate-testpatch-tmp setup-source dist-configs-check
 		kvm_stat.logrotate \
 		mod-denylist.sh \
 		mod-internal.list \
+		mod-partner.list \
 		mod-sign.sh \
 		configs/flavors \
 		configs/generate_all_configs.sh \
diff --git a/redhat/configs/ark/generic/CONFIG_AFS_FS b/redhat/configs/ark/generic/CONFIG_AFS_FS
diff --git a/redhat/configs/ark/generic/CONFIG_AF_RXRPC b/redhat/configs/ark/generic/CONFIG_AF_RXRPC
diff --git a/redhat/configs/common/generic/CONFIG_AFS_DEBUG b/redhat/configs/common/generic/CONFIG_AFS_DEBUG
@@ -0,0 +1 @@
+CONFIG_AFS_DEBUG=y
diff --git a/redhat/configs/common/generic/CONFIG_AFS_DEBUG_CURSOR b/redhat/configs/common/generic/CONFIG_AFS_DEBUG_CURSOR
@@ -0,0 +1 @@
+# CONFIG_AFS_DEBUG_CURSOR is not set
diff --git a/redhat/configs/common/generic/CONFIG_AFS_FS b/redhat/configs/common/generic/CONFIG_AFS_FS
@@ -0,0 +1 @@
+CONFIG_AFS_FS=m
diff --git a/redhat/configs/common/generic/CONFIG_AFS_FSCACHE b/redhat/configs/common/generic/CONFIG_AFS_FSCACHE
@@ -0,0 +1 @@
+CONFIG_AFS_FSCACHE=y
diff --git a/redhat/configs/common/generic/CONFIG_AF_RXRPC b/redhat/configs/common/generic/CONFIG_AF_RXRPC
@@ -0,0 +1 @@
+CONFIG_AF_RXRPC=m
diff --git a/redhat/configs/common/generic/CONFIG_AF_RXRPC_DEBUG b/redhat/configs/common/generic/CONFIG_AF_RXRPC_DEBUG
@@ -0,0 +1 @@
+CONFIG_AF_RXRPC_DEBUG=y
diff --git a/redhat/configs/common/generic/CONFIG_AF_RXRPC_INJECT_LOSS b/redhat/configs/common/generic/CONFIG_AF_RXRPC_INJECT_LOSS
@@ -0,0 +1 @@
+# CONFIG_AF_RXRPC_INJECT_LOSS is not set
diff --git a/redhat/configs/common/generic/CONFIG_AF_RXRPC_IPV6 b/redhat/configs/common/generic/CONFIG_AF_RXRPC_IPV6
@@ -0,0 +1 @@
+CONFIG_AF_RXRPC_IPV6=y
diff --git a/redhat/configs/common/generic/CONFIG_RXKAD b/redhat/configs/common/generic/CONFIG_RXKAD
@@ -0,0 +1 @@
+CONFIG_RXKAD=y
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
@@ -850,6 +850,7 @@ Source81: process_configs.sh
 Source82: update_scripts.sh
 
 Source84: mod-internal.list
+Source85: mod-partner.list
 
 Source100: rheldup3.x509
 Source101: rhelkpatch1.x509
@@ -1367,6 +1368,9 @@ Requires: kernel-%{?1:%{1}-}-modules-core-uname-r = %{KVERREL}%{uname_variant %{
 %{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\
 %if %{efiuki}\
@@ -1378,6 +1382,27 @@ Requires: kernel%{?1:-%{1}}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{?1
 %endif\
 %{nil}
 
+#
+# This macro creates a kernel-<subpackage>-modules-partner package.
+#	%%kernel_modules_partner_package <subpackage> <pretty-name>
+#
+%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}%{uname_suffix %{?1:%{1}}}\
+Provides: kernel%{?1:-%{1}}-modules-partner = %{version}-%{release}%{uname_suffix %{?1:%{1}}}\
+Provides: installonlypkg(kernel-module)\
+Provides: kernel%{?1:-%{1}}-modules-partner-uname-r = %{KVERREL}%{uname_suffix %{?1:%{1}}}\
+Requires: kernel-uname-r = %{KVERREL}%{uname_suffix %{?1:%{1}}}\
+Requires: kernel%{?1:-%{1}}-modules-uname-r = %{KVERREL}%{uname_suffix %{?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}
@@ -2173,6 +2198,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
@@ -2190,6 +2219,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
@@ -2281,13 +2314,19 @@ BuildKernel() {
     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}
+    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
     rm -f $RPM_BUILD_ROOT/modules.list
     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 %{with_cross}
     make -C $RPM_BUILD_ROOT/lib/modules/$KernelVer/build M=scripts clean
@@ -2928,6 +2967,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 [<subpackage>]
+#
+%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.
@@ -2998,6 +3050,9 @@ fi\
 %{expand:%%kernel_modules_core_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:\
@@ -3296,6 +3351,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}\
diff --git a/redhat/mod-partner.list b/redhat/mod-partner.list
@@ -0,0 +1,2 @@
+afs
+rxrpc

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# CONFIG_AF_RXRPC_INJECT_LOSS is not set`