From 825beebeeb9d08feea71445b38e80967e9538416ccfeb53dff9851e3be79e1f6 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 18 Aug 2021 11:14:50 +0000 Subject: [PATCH] Accepting request 912880 from home:michals - Display module information even for modules built into the running kernel (bsc#1189537). + libkmod-Provide-info-even-for-modules-built-into-the.patch OBS-URL: https://build.opensuse.org/request/show/912880 OBS-URL: https://build.opensuse.org/package/show/Base:System/kmod?expand=0&rev=194 --- kmod-testsuite.spec | 1 + kmod.changes | 7 ++++ kmod.spec | 1 + ...info-even-for-modules-built-into-the.patch | 33 +++++++++++++++++++ 4 files changed, 42 insertions(+) create mode 100644 libkmod-Provide-info-even-for-modules-built-into-the.patch diff --git a/kmod-testsuite.spec b/kmod-testsuite.spec index dff62ba..cffa4a4 100644 --- a/kmod-testsuite.spec +++ b/kmod-testsuite.spec @@ -37,6 +37,7 @@ Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch Patch6: 0012-modprobe-print-unsupported-status.patch Patch7: usr-lib-modprobe.patch Patch8: no-stylesheet-download.patch +Patch9: libkmod-Provide-info-even-for-modules-built-into-the.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: docbook5-xsl-stylesheets diff --git a/kmod.changes b/kmod.changes index b5b86b2..1ab4632 100644 --- a/kmod.changes +++ b/kmod.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Aug 18 10:55:57 UTC 2021 - Michal Suchanek + +- Display module information even for modules built into the running kernel + (bsc#1189537). + + libkmod-Provide-info-even-for-modules-built-into-the.patch + ------------------------------------------------------------------- Mon Jun 7 06:29:19 UTC 2021 - Callum Farmer diff --git a/kmod.spec b/kmod.spec index c31a1d7..ed243d1 100644 --- a/kmod.spec +++ b/kmod.spec @@ -37,6 +37,7 @@ Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch Patch6: 0012-modprobe-print-unsupported-status.patch Patch7: usr-lib-modprobe.patch Patch8: no-stylesheet-download.patch +Patch9: libkmod-Provide-info-even-for-modules-built-into-the.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: docbook5-xsl-stylesheets diff --git a/libkmod-Provide-info-even-for-modules-built-into-the.patch b/libkmod-Provide-info-even-for-modules-built-into-the.patch new file mode 100644 index 0000000..f1f5fd7 --- /dev/null +++ b/libkmod-Provide-info-even-for-modules-built-into-the.patch @@ -0,0 +1,33 @@ +From 446dd2bd337f88d71682b079ce7470a4232ac1e8 Mon Sep 17 00:00:00 2001 +From: Takashi Iwai +Date: Wed, 18 Aug 2021 12:42:17 +0200 +Subject: [PATCH] libkmod: Provide info even for modules built into the running + kernel. + +When a module is built-in examining the module file is skipped. + +However, a module that is built into the runnig kernel may be separate +in another kernel. Always examine the module file if it exists. + +Signed-off-by: Michal Suchanek +--- + libkmod/libkmod-module.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/libkmod/libkmod-module.c b/libkmod/libkmod-module.c +index 6e0ff1a99604..9e878a5345a1 100644 +--- a/libkmod/libkmod-module.c ++++ b/libkmod/libkmod-module.c +@@ -2292,7 +2292,8 @@ KMOD_EXPORT int kmod_module_get_info(const struct kmod_module *mod, struct kmod_ + assert(*list == NULL); + + /* remove const: this can only change internal state */ +- if (kmod_module_is_builtin((struct kmod_module *)mod)) { ++ if (!kmod_module_get_path(mod) && ++ kmod_module_is_builtin((struct kmod_module *)mod)) { + count = kmod_builtin_get_modinfo(mod->ctx, + kmod_module_get_name(mod), + &strings); +-- +2.31.1 +