From: Jan Stancek <jstancek(a)redhat.com>
redhat: introduce modules-extra-matched meta package
There are packages that require kmods from modules-extra to function
correctly. These however have no concept of what kernel variants
and versions are installed. Add a meta package that can act as
a single point of reference, that these other packages can Require
and leave it to kernel to pull in correct variant and version
of modules-extra package.
Signed-off-by: Jan Stancek <jstancek(a)redhat.com>
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -692,6 +692,7 @@ ExclusiveOS: Linux
Requires: kernel-core-uname-r = %{KVERREL}
Requires: kernel-modules-uname-r = %{KVERREL}
Requires: kernel-modules-core-uname-r = %{KVERREL}
+Requires: ((kernel-modules-extra-uname-r = %{KVERREL}) if kernel-modules-extra-matched)
Provides: installonlypkg(kernel)
%endif
@@ -1442,6 +1443,13 @@ Requires: %{package_name}%{?1:-%{1}}-core = %{specrpmversion}-%{release}\
This meta package is used to install matching core and devel packages for a given %{?2:%{2} }kernel.\
%{nil}
+%define kernel_modules_extra_matched_package(m) \
+%package modules-extra-matched\
+Summary: Meta package which requires modules-extra to be installed for all kernels.\
+%description modules-extra-matched\
+This meta package provides a single reference that other packages can Require to have modules-extra installed for all kernels.\
+%{nil}
+
#
# This macro creates a kernel-<subpackage>-modules-internal package.
# %%kernel_modules_internal_package <subpackage> <pretty-name>
@@ -1543,6 +1551,7 @@ summary: kernel meta-package for the %{1} kernel\
Requires: kernel-%{1}-core-uname-r = %{KVERREL}%{uname_suffix %{1}}\
Requires: kernel-%{1}-modules-uname-r = %{KVERREL}%{uname_suffix %{1}}\
Requires: kernel-%{1}-modules-core-uname-r = %{KVERREL}%{uname_suffix %{1}}\
+Requires: ((kernel-%{1}-modules-extra-uname-r = %{KVERREL}%{uname_suffix %{1}}) if kernel-modules-extra-matched)\
%if "%{1}" == "rt" || "%{1}" == "rt-debug" || "%{1}" == "rt-64k" || "%{1}" == "rt-64k-debug"\
Requires: realtime-setup\
%endif\
@@ -1846,6 +1855,8 @@ Prebuilt 64k unified kernel image for virtual machines.
Prebuilt 64k unified kernel image addons for virtual machines.
%endif
+%kernel_modules_extra_matched_package
+
%define log_msg() \
{ set +x; } 2>/dev/null \
_log_msglineno=$(grep -n %{*} %{_specdir}/${RPM_PACKAGE_NAME}.spec | grep log_msg | cut -d":" -f1) \
@@ -4254,6 +4265,8 @@ fi\
%kernel_variant_files %{_use_vdso} %{with_debug} rt-64k-debug
%endif
+%files modules-extra-matched
+
# plz don't put in a version string unless you're going to tag
# and build.
#
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3745
Hi, we tested your kernel and here are the results:
Overall result: PASSED
Merge: OK
Compile: OK
Test: OK
Tested-by: CKI Project <cki-project(a)redhat.com>
Kernel information:
Brew / Koji Task ID: 131976766
You can find all the details about the test run at
https://datawarehouse.cki-project.org/kcidb/checkouts/redhat:koji-131976766
Tests that were not ran because of internal issues:
Boot test [s390x]
CKI/restraint [s390x]
machineinfo [ppc64le, s390x]
Reboot test [s390x]
SELinux Custom Module Setup [ppc64le, s390x]
stress: stress-ng - cpu [s390x]
stress: stress-ng - cpu-cache [s390x]
stress: stress-ng - interrupt [s390x]
stress: stress-ng - memory [s390x]
If you find a failure unrelated to your changes, please ask the test maintainer to review it.
This will prevent the failures from being incorrectly reported in the future.
Please reply to this email if you have any questions about the tests that we
ran or if you have any suggestions on how to make future tests more effective.
,-. ,-.
( C ) ( K ) Continuous
`-',-.`-' Kernel
( I ) Integration
`-'
______________________________________________________________________________
From: Gregory Bell on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3839
JIRA: https://issues.redhat.com/browse/RHEL-88228
Upstream Status: RHEL-only
Python3-docutils & python3-jsonschema are required by selftests but are
provided only with +tools and +ynl. Adding python3-docutils and
python3-jsonschema to selftests build requirements
Signed-off-by: Gregory Bell <grbell(a)redhat.com>
---
redhat/kernel.spec.template | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)