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
@@ -680,6 +680,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
@@ -1426,6 +1427,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>
@@ -1527,6 +1535,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"\
Requires: realtime-setup\
%endif\
@@ -1807,6 +1816,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) \
@@ -4181,6 +4192,8 @@ fi\
%kernel_variant_files %{_use_vdso} %{with_arm64_16k_base} 16k
%kernel_variant_files %{_use_vdso} %{with_arm64_64k_base} 64k
+%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: 131814318
You can find all the details about the test run at
https://datawarehouse.cki-project.org/kcidb/checkouts/redhat:koji-131814318
Tests that were not ran because of internal issues:
Boot test [s390x]
CKI/restraint [s390x]
machineinfo [s390x]
Reboot test [s390x]
SELinux Custom Module Setup [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: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
[redhat] New configs in drivers/hid
Hi,
As part of the ongoing rebase effort, the following configuration
options need to be reviewed.
As a reminder, the ARK configuration flow involves moving unreviewed
configuration options from the pending directory to the ark directory.
In the diff below, options are removed from the pending directory and
added to the ark hierarchy. The final options that need to be ACKed
are the files that are being added to the ark hierarchy.
If the value for a file that is added should be changed, please reply
with a better option.
Symbol: HID_APPLETB_BL [=n]
Type : tristate
Defined at drivers/hid/Kconfig:151
Prompt: Apple Touch Bar Backlight
Depends on: HID_SUPPORT [=y] && HID [=y] && BACKLIGHT_CLASS_DEVICE [=y]
Location:
-> Device Drivers
-> HID bus support (HID_SUPPORT [=y])
-> HID bus core support (HID [=y])
-> Special HID drivers
-> Apple Touch Bar Backlight (HID_APPLETB_BL [=n])
Selected by [n]:
- HID_APPLETB_KBD [=n] && HID_SUPPORT [=y] && HID [=y] && USB_HID [=y] && BACKLIGHT_CLASS_DEVICE [=y] && INPUT [=y]
Commit: 1fd41e5e3d7c (HID: hid-appletb-bl: add driver for the backlight of Apple Touch Bars)
---
Symbol: HID_APPLETB_KBD [=n]
Type : tristate
Defined at drivers/hid/Kconfig:161
Prompt: Apple Touch Bar Keyboard Mode
Depends on: HID_SUPPORT [=y] && HID [=y] && USB_HID [=y] && BACKLIGHT_CLASS_DEVICE [=y] && INPUT [=y]
Location:
-> Device Drivers
-> HID bus support (HID_SUPPORT [=y])
-> HID bus core support (HID [=y])
-> Special HID drivers
-> Apple Touch Bar Keyboard Mode (HID_APPLETB_KBD [=n])
Selects: INPUT_SPARSEKMAP [=m] && HID_APPLETB_BL [=n]
Commit: 8e9b9152cfbd (HID: hid-appletb-kbd: add driver for the keyboard mode of Apple Touch Bars)
---
Symbol: HID_UNIVERSAL_PIDFF [=n]
Type : tristate
Defined at drivers/hid/Kconfig:1249
Prompt: universal-pidff: extended USB PID driver compatibility and usage
Depends on: HID_SUPPORT [=y] && HID [=y] && USB_HID [=y] && HID_PID [=y]
Location:
-> Device Drivers
-> HID bus support (HID_SUPPORT [=y])
-> HID bus core support (HID [=y])
-> Special HID drivers
-> universal-pidff: extended USB PID driver compatibility and usage (HID_UNIVERSAL_PIDFF [=n])
Commit: f06bf8d94fff (HID: Add hid-universal-pidff driver and supported device ids)
---
Signed-off-by: Fedora Kernel Team <kernel-team(a)fedoraproject.org>
diff --git a/redhat/configs/pending-rhel/generic/CONFIG_HID_APPLETB_BL b/redhat/configs/pending-rhel/generic/CONFIG_HID_APPLETB_BL
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-rhel/generic/CONFIG_HID_APPLETB_BL
+++ /dev/null
@@ -1,18 +0,0 @@
-# Symbol: HID_APPLETB_BL [=n]
-# Type : tristate
-# Defined at drivers/hid/Kconfig:151
-# Prompt: Apple Touch Bar Backlight
-# Depends on: HID_SUPPORT [=y] && HID [=y] && BACKLIGHT_CLASS_DEVICE [=y]
-# Location:
-# -> Device Drivers
-# -> HID bus support (HID_SUPPORT [=y])
-# -> HID bus core support (HID [=y])
-# -> Special HID drivers
-# -> Apple Touch Bar Backlight (HID_APPLETB_BL [=n])
-# Selected by [n]:
-# - HID_APPLETB_KBD [=n] && HID_SUPPORT [=y] && HID [=y] && USB_HID [=y] && BACKLIGHT_CLASS_DEVICE [=y] && INPUT [=y]
-#
-#
-#
-# Commit: 1fd41e5e3d7c (HID: hid-appletb-bl: add driver for the backlight of Apple Touch Bars)
-# CONFIG_HID_APPLETB_BL is not set
diff --git a/redhat/configs/pending-rhel/generic/CONFIG_HID_APPLETB_KBD b/redhat/configs/pending-rhel/generic/CONFIG_HID_APPLETB_KBD
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-rhel/generic/CONFIG_HID_APPLETB_KBD
+++ /dev/null
@@ -1,17 +0,0 @@
-# Symbol: HID_APPLETB_KBD [=n]
-# Type : tristate
-# Defined at drivers/hid/Kconfig:161
-# Prompt: Apple Touch Bar Keyboard Mode
-# Depends on: HID_SUPPORT [=y] && HID [=y] && USB_HID [=y] && BACKLIGHT_CLASS_DEVICE [=y] && INPUT [=y]
-# Location:
-# -> Device Drivers
-# -> HID bus support (HID_SUPPORT [=y])
-# -> HID bus core support (HID [=y])
-# -> Special HID drivers
-# -> Apple Touch Bar Keyboard Mode (HID_APPLETB_KBD [=n])
-# Selects: INPUT_SPARSEKMAP [=m] && HID_APPLETB_BL [=n]
-#
-#
-#
-# Commit: 8e9b9152cfbd (HID: hid-appletb-kbd: add driver for the keyboard mode of Apple Touch Bars)
-# CONFIG_HID_APPLETB_KBD is not set
diff --git a/redhat/configs/pending-rhel/generic/CONFIG_HID_UNIVERSAL_PIDFF b/redhat/configs/pending-rhel/generic/CONFIG_HID_UNIVERSAL_PIDFF
deleted file mode 100644
index blahblah..blahblah 0
--- a/redhat/configs/pending-rhel/generic/CONFIG_HID_UNIVERSAL_PIDFF
+++ /dev/null
@@ -1,16 +0,0 @@
-# Symbol: HID_UNIVERSAL_PIDFF [=n]
-# Type : tristate
-# Defined at drivers/hid/Kconfig:1249
-# Prompt: universal-pidff: extended USB PID driver compatibility and usage
-# Depends on: HID_SUPPORT [=y] && HID [=y] && USB_HID [=y] && HID_PID [=y]
-# Location:
-# -> Device Drivers
-# -> HID bus support (HID_SUPPORT [=y])
-# -> HID bus core support (HID [=y])
-# -> Special HID drivers
-# -> universal-pidff: extended USB PID driver compatibility and usage (HID_UNIVERSAL_PIDFF [=n])
-#
-#
-#
-# Commit: f06bf8d94fff (HID: Add hid-universal-pidff driver and supported device ids)
-# CONFIG_HID_UNIVERSAL_PIDFF is not set
diff --git a/redhat/configs/rhel/generic/CONFIG_HID_APPLETB_BL b/redhat/configs/rhel/generic/CONFIG_HID_APPLETB_BL
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/generic/CONFIG_HID_APPLETB_BL
@@ -0,0 +1 @@
+# CONFIG_HID_APPLETB_BL is not set
diff --git a/redhat/configs/rhel/generic/CONFIG_HID_APPLETB_KBD b/redhat/configs/rhel/generic/CONFIG_HID_APPLETB_KBD
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/generic/CONFIG_HID_APPLETB_KBD
@@ -0,0 +1 @@
+# CONFIG_HID_APPLETB_KBD is not set
diff --git a/redhat/configs/rhel/generic/CONFIG_HID_UNIVERSAL_PIDFF b/redhat/configs/rhel/generic/CONFIG_HID_UNIVERSAL_PIDFF
new file mode 100644
index blahblah..blahblah 100644
--- /dev/null
+++ b/redhat/configs/rhel/generic/CONFIG_HID_UNIVERSAL_PIDFF
@@ -0,0 +1 @@
+# CONFIG_HID_UNIVERSAL_PIDFF is not set
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3757