add option for finding libgcc

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

Author: desultory

src/ugrd/base/core.py

@@ -1,5 +1,5 @@
 __author__ = 'desultory'
-__version__ = '3.2.0'
+__version__ = '3.3.0'
 
 from pathlib import Path
 from typing import Union
@@ -140,6 +140,27 @@ def deploy_nodes(self) -> None:
             raise e
 
 
+@check_dict('find_libgcc', value=True, log_level=20, message="Skipping libgcc_s dependency resolution.")
+def find_libgcc(self) -> None:
+    """
+    Finds libgcc.so, adds a 'dependencies' item for it.
+    Adds the parent directory to 'library_paths'
+    """
+    from pathlib import Path
+
+    try:
+        ldconfig = self._run(['ldconfig', '-p']).stdout.decode().split("\n")
+    except RuntimeError:
+        return self.logger.critical("Unable to run ldconfig -p, if GCC is being used, this is fatal!")
+
+    libgcc = [lib for lib in ldconfig if 'libgcc_s' in lib and '(libc6,' in lib][0]
+    source_path = Path(libgcc.partition('=> ')[-1])
+    self.logger.info("Source path for libgcc_s: %s" % source_path)
+
+    self['dependencies'] = source_path
+    self['library_paths'] = str(source_path.parent)
+
+
 def _process_paths_multi(self, path: Union[Path, str]) -> None:
     """
     Converts the input to a Path if it is not one.
@@ -161,8 +182,7 @@ def _process_paths_multi(self, path: Union[Path, str]) -> None:
 def _process_binaries_multi(self, binary: str) -> None:
     """ Processes binaries into the binaries list, adding dependencies along the way. """
     if binary in self['binaries']:
-        self.logger.debug("Binary already in binaries list, skipping: %s" % binary)
-        return
+        return self.logger.debug("Binary already in binaries list, skipping: %s" % binary)
 
     # Check if there is an import function that collides with the name of the binary
     if funcs := self['imports'].get('functions'):

src/ugrd/base/core.toml

@@ -3,6 +3,7 @@ build_dir = "/tmp/initramfs"
 _build_log_level = 10
 out_dir = "/tmp/initramfs_out"
 clean = true
+find_libgcc = true
 hostonly = true
 validate = true
 library_paths = [ "/lib64" ]
@@ -32,7 +33,7 @@ minor = 1
 		   ]
 
 [imports.build_pre]
-"ugrd.base.core" = [ "clean_build_dir" ]
+"ugrd.base.core" = [ "clean_build_dir", "find_libgcc" ]
 
 [imports.build_tasks]
 "ugrd.base.core" = [ "generate_structure", "deploy_dependencies", "deploy_gz_dependencies", "deploy_copies", "deploy_nodes", "deploy_symlinks" ]
@@ -53,6 +54,7 @@ dependencies = "NoDupFlatList"  # Dependencies, used to define the dependencies
 opt_dependencies = "NoDupFlatList"  # Optional dependencies, which will be included if they are found
 gz_dependencies = "NoDupFlatList"  # GZipped dependencies property, used to define the gzipped dependencies (will be extracted)
 library_paths = "NoDupFlatList"  # library_paths property, used to define the library paths to add to LD_LIBRARY_PATH
+find_libgcc = "bool"  # If true, the initramfs will search for libgcc_s.so.1 and add it to the initramfs
 binaries = "NoDupFlatList"  # Binaries which should be included in the intiramfs, dependencies resolved with lddtree
 copies = "dict"  # Copies dict, defines the files to be copied to the initramfs
 nodes = "dict"  # Nodes dict, defines the device nodes to be created

src/ugrd/crypto/cryptsetup.py

@@ -1,5 +1,5 @@
 __author__ = 'desultory'
-__version__ = '2.2.1'
+__version__ = '2.2.2'
 
 from zenlib.util import check_dict
 
@@ -272,18 +272,3 @@ def crypt_init(self) -> list[str]:
                 'fi']
     return out
 
-
-def find_libgcc(self) -> None:
-    """
-    Finds libgcc.so, adds a 'dependencies' item for it.
-    Adds the parent directory to 'library_paths'
-    """
-    from pathlib import Path
-
-    ldconfig = self._run(['ldconfig', '-p']).stdout.decode().split("\n")
-    libgcc = [lib for lib in ldconfig if 'libgcc_s' in lib and '(libc6,' in lib][0]
-    source_path = Path(libgcc.partition('=> ')[-1])
-    self.logger.info("Source path for libgcc_s: %s" % source_path)
-
-    self['dependencies'] = source_path
-    self['library_paths'] = str(source_path.parent)

src/ugrd/crypto/cryptsetup.toml

@@ -12,9 +12,6 @@ cryptsetup_autoretry = true
 [imports.config_processing]
 "ugrd.crypto.cryptsetup" = [ "_process_cryptsetup_multi", "_process_cryptsetup_key_types_multi" ]
 
-[imports.build_pre]
-"ugrd.crypto.cryptsetup" = [ "find_libgcc" ]
-
 [imports.init_early]
 "ugrd.crypto.cryptsetup" = [ "get_crypt_sources" ]