From: Daan De Meyer Date: Tue, 5 Sep 2023 12:58:05 +0000 (+0200) Subject: Do not run modinfo on builtin modules X-Git-Tag: v16~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb5974d013f7c4c2a45f67c9ae990767e32e9034;p=thirdparty%2Fmkosi.git Do not run modinfo on builtin modules This causes issues on CentOS Stream 8 with errors about not being able to find builtin modules. Aside from the issues, running modinfo on builtin modules also does not make a lot of sense. We run modinfo to fetch module and firmware dependencies, but a builtin module that has non-builtin module dependencies is not really valuable because the dependent module has to be loaded from disk then. The same goes for firmware dependencies. --- diff --git a/mkosi/kmod.py b/mkosi/kmod.py index 1522358e1..a5894e48f 100644 --- a/mkosi/kmod.py +++ b/mkosi/kmod.py @@ -58,7 +58,7 @@ def resolve_module_dependencies(root: Path, kver: str, modules: Sequence[str]) - # We could run modinfo once for each module but that's slow. Luckily we can pass multiple modules to # modinfo and it'll process them all in a single go. We get the modinfo for all modules to build two maps # that map the path of the module to its module dependencies and its firmware dependencies respectively. - info = bwrap(chroot_cmd(root) + ["modinfo", "--set-version", kver, "--null", *nametofile.keys(), *builtin], + info = bwrap(chroot_cmd(root) + ["modinfo", "--set-version", kver, "--null", *nametofile.keys()], stdout=subprocess.PIPE).stdout log_step("Calculating required kernel modules and firmware")