Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

kmod: Don't assume all modules are in kernel/ subdirectory #2532

Merged
merged 2 commits into from
Mar 19, 2024
Merged

kmod: Don't assume all modules are in kernel/ subdirectory #2532

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4dd8075
kmod: Simplify resolve_module_dependencies() slightly
DaanDeMeyer Mar 19, 2024
36ab757
kmod: Don't assume all modules are in kernel/ subdirectory
DaanDeMeyer Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions mkosi/kmod.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def filter_kernel_modules(
host: bool,
) -> list[Path]:
modulesd = root / "usr/lib/modules" / kver
modules = set((modulesd / "kernel").rglob("*.ko*"))
modules = set(modulesd.rglob("*.ko*"))

if host:
include = [*include, *loaded_modules()]
Expand All @@ -35,7 +35,7 @@ def filter_kernel_modules(
if include:
regex = re.compile("|".join(include))
for m in modules:
rel = os.fspath(m.relative_to(modulesd / "kernel"))
rel = os.fspath(Path(*m.relative_to(modulesd).parts[1:]))
if regex.search(rel):
logging.debug(f"Including module {rel}")
keep.add(rel)
Expand All @@ -44,7 +44,7 @@ def filter_kernel_modules(
remove = set()
regex = re.compile("|".join(exclude))
for m in modules:
rel = os.fspath(m.relative_to(modulesd / "kernel"))
rel = os.fspath(Path(*m.relative_to(modulesd).parts[1:]))
if rel not in keep and regex.search(rel):
logging.debug(f"Excluding module {rel}")
remove.add(m)
Expand Down Expand Up @@ -74,9 +74,9 @@ def resolve_module_dependencies(
of module names (including the given module paths themselves). The paths are returned relative to the
root directory.
"""
modulesd = Path("usr/lib/modules") / kver
builtin = set(module_path_to_name(Path(m)) for m in (root / modulesd / "modules.builtin").read_text().splitlines())
allmodules = set((root / modulesd / "kernel").rglob("*.ko*"))
modulesd = root / "usr/lib/modules" / kver
builtin = set(module_path_to_name(Path(m)) for m in (modulesd / "modules.builtin").read_text().splitlines())
allmodules = set(modulesd.rglob("*.ko*"))
nametofile = {module_path_to_name(m): m for m in allmodules}

log_step("Running modinfo to fetch kernel module dependencies")
Expand Down Expand Up @@ -175,7 +175,7 @@ def gen_required_kernel_modules(
mods, firmware = resolve_module_dependencies(root, kver, names, sandbox=sandbox)
else:
logging.debug("No modules excluded and no firmware installed, using kernel modules generation fast path")
mods = set((modulesd / "kernel").rglob("*.ko*"))
mods = set(modulesd.rglob("*.ko*"))
firmware = set()

yield from sorted(
Expand Down Expand Up @@ -212,7 +212,7 @@ def process_kernel_modules(
gen_required_kernel_modules(root, kver, include=include, exclude=exclude, host=host, sandbox=sandbox)
)

for m in sorted((root / "usr/lib/modules" / kver / "kernel").rglob("*"), reverse=True):
for m in sorted((root / "usr/lib/modules" / kver).rglob("*.ko*"), reverse=True):
if m in required:
continue

Expand Down
Loading