]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
Adjust logging messages for kmod/fw resolution
authorLaurence Kiln <246209442+LaurenceKiln@users.noreply.github.com>
Mon, 8 Dec 2025 14:33:20 +0000 (16:33 +0200)
committerDaan De Meyer <daan.j.demeyer@gmail.com>
Wed, 17 Dec 2025 10:45:46 +0000 (11:45 +0100)
mkosi/kmod.py

index 17ba1762ccd661ab05b57ad710caad133471690f..9d7e4c9175a24ec7516c5144a2fe53e812621412 100644 (file)
@@ -85,10 +85,11 @@ def filter_kernel_modules(
     include: Iterable[str],
     exclude: Iterable[str],
 ) -> list[str]:
+    log_step("Applying kernel modules include/exclude configuration")
     if include:
-        logging.debug(f"Kernel modules include: {' '.join(include)}")
+        logging.debug(f"Kernel modules include directives: {' '.join(include)}")
     if exclude:
-        logging.debug(f"Kernel modules exclude: {' '.join(exclude)}")
+        logging.debug(f"Kernel modules exclude directives: {' '.join(exclude)}")
 
     modulesd = Path("usr/lib/modules") / kver
     with chdir(root):
@@ -137,7 +138,7 @@ def filter_kernel_modules(
         # If no exclude patterns are specified, only keep the specified kernel modules.
         modules = {modulesd / m for m in keep}
 
-    logging.debug(f"Including {len(modules)}/{n_modules} kernel modules.")
+    logging.debug(f"Passing {len(modules)}/{n_modules} kernel modules on to dependency resolution.")
 
     return sorted(module_path_to_name(m) for m in modules)
 
@@ -149,10 +150,11 @@ def filter_firmware(
     include: Iterable[str],
     exclude: Iterable[str],
 ) -> set[Path]:
+    log_step("Applying firmware include/exclude configuration")
     if include:
-        logging.debug(f"Firmware include: {' '.join(include)}")
+        logging.debug(f"Firmware include directives: {' '.join(include)}")
     if exclude:
-        logging.debug(f"Firmware exclude: {' '.join(exclude)}")
+        logging.debug(f"Firmware exclude directives: {' '.join(exclude)}")
 
     firmwared = Path("usr/lib/firmware")
 
@@ -185,7 +187,7 @@ def filter_firmware(
             if (patterns and regex.search(rel)) or globs_match_firmware(rel, globs):
                 firmware.add(f)
 
-    logging.debug(f"Including {len(firmware)} firmware files")
+    logging.debug(f"A total of {len(firmware)} firmware files will be included in the image")
 
     return firmware