Make calculate_modules and process_module_metadata run separately, bump version

Signed-off-by: Zen <[email protected]>

Author: desultory

ugrd/initramfs_generator.py

@@ -1,6 +1,6 @@
 
 __author__ = "desultory"
-__version__ = "0.10.0"
+__version__ = "0.10.1"
 
 from tomllib import load
 from typing import Union

ugrd/kmod/kmod.py

@@ -9,10 +9,6 @@
                          'modules.dep', 'modules.dep.bin', 'modules.devname', 'modules.order', 'modules.softdep', 'modules.symbols', 'modules.symbols.bin']
 
 
-class IgnoredKernelModule(Exception):
-    pass
-
-
 class DependencyResolutionError(Exception):
     pass
 
@@ -188,6 +184,31 @@ def get_lsmod_modules(self) -> list[str]:
     return list(modules)
 
 
+def calculate_modules(self) -> None:
+    """
+    Populates the kernel_modules list with all required kernel modules.
+    If kmod_autodetect_lsmod is set, adds the contents of lsmod if specified.
+    If kmod_autodetect_lspci is set, adds the contents of lspci -k if specified.
+    Adds the contents of _kmod_depend if specified.
+    Performs dependency resolution on all kernel modules.
+    """
+    if self.config_dict['kmod_autodetect_lsmod']:
+        autodetected_modules = get_lsmod_modules(self)
+        self.logger.info("Autodetected kernel modules from lsmod: %s" % autodetected_modules)
+        self.config_dict['kernel_modules'] = autodetected_modules
+
+    if self.config_dict['kmod_autodetect_lspci']:
+        autodetected_modules = get_lspci_modules(self)
+        self.logger.info("Autodetected kernel modules from lscpi -k: %s" % autodetected_modules)
+        self.config_dict['kernel_modules'] = autodetected_modules
+
+    if self.config_dict['_kmod_depend']:
+        self.logger.info("Adding internal dependencies to kmod_init: %s" % self.config_dict['_kmod_depend'])
+        self.config_dict['kmod_init'] = self.config_dict['_kmod_depend'].copy()  # Copy because _kmood_depend may shrink during iteration
+
+    self.logger.info("Included kernel modules: %s" % self.config_dict['kernel_modules'])
+
+
 def process_module_metadata(self) -> None:
     """
     Gets all module metadata for the specified kernel version.
@@ -214,32 +235,6 @@ def process_module_metadata(self) -> None:
         self.config_dict['dependencies'] = meta_file_path
 
 
-def calculate_modules(self) -> None:
-    """
-    Populates the kernel_modules list with all required kernel modules.
-    If kmod_autodetect_lsmod is set, adds the contents of lsmod if specified.
-    If kmod_autodetect_lspci is set, adds the contents of lspci -k if specified.
-    Adds the contents of _kmod_depend if specified.
-    Performs dependency resolution on all kernel modules.
-    """
-    if self.config_dict['kmod_autodetect_lsmod']:
-        autodetected_modules = get_lsmod_modules(self)
-        self.logger.info("Autodetected kernel modules from lsmod: %s" % autodetected_modules)
-        self.config_dict['kernel_modules'] = autodetected_modules
-
-    if self.config_dict['kmod_autodetect_lspci']:
-        autodetected_modules = get_lspci_modules(self)
-        self.logger.info("Autodetected kernel modules from lscpi -k: %s" % autodetected_modules)
-        self.config_dict['kernel_modules'] = autodetected_modules
-
-    if self.config_dict['_kmod_depend']:
-        self.logger.info("Adding internal dependencies to kmod_init: %s" % self.config_dict['_kmod_depend'])
-        self.config_dict['kmod_init'] = self.config_dict['_kmod_depend'].copy()  # Copy because _kmood_depend may shrink during iteration
-
-    self.logger.info("Included kernel modules: %s" % self.config_dict['kernel_modules'])
-    process_module_metadata(self)
-
-
 def process_modules(self) -> None:
     """
     Processes all kernel modules, adding dependencies to the initramfs

ugrd/kmod/kmod.toml

@@ -21,7 +21,7 @@ _kmod_modinfo = "dict" # Used internally, caches modinfo output for kernel modul
 "ugrd.kmod.kmod" = [ "_process_kmod_init_multi", "_process_kernel_modules_multi", "_process_kmod_ignore_multi" ]
 
 [imports.build_pre]
-"ugrd.kmod.kmod" = [ "calculate_modules", "process_modules" ]
+"ugrd.kmod.kmod" = [ "calculate_modules", "process_module_metadata", "process_modules" ]
 
 [imports.init_pre]
 "ugrd.kmod.kmod" = [ "load_modules" ]