readded find-libgcc to cryptsetup, start pulling python into debug (experimental)

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

Author: desultory

ugrd/base/debug.py

@@ -14,6 +14,15 @@ def start_shell(self):
         return None
 
 
+def pull_python_parts(self):
+    """
+    Gets stuff from /usr/lib/python-exec/python{version} and adds it to the dependencies.
+    """
+    pyton_parts = ['python', 'python3', 'python-config', 'pydoc']
+    for part in pyton_parts:
+        self.config_dict['dependencies'] = Path(f"/usr/lib/python-exec/python{self.config_dict['python_version']}") / part
+
+
 def pull_valgrind_parts(self):
     """
     Gets the stuff which was dostrip -x'd from valgrind and adds it to the dependencies.

ugrd/base/debug.toml

@@ -1,11 +1,13 @@
 binaries = ['cp', 'mv', 'rm', 'nano', 'find', 'grep', 'dmesg', 'chmod', 'touch', 'valgrind', 'gdb', 'python']
 
-[imports.build_pre]
-"ugrd.base.debug" = [ "pull_valgrind_parts" ]
+python_version = "3.11"
 
+[imports.build_pre]
+"ugrd.base.debug" = [ "pull_python_parts", "pull_valgrind_parts" ]
 
 [imports.init_debug]
 "ugrd.base.debug" = [ "start_shell" ]
 
 [custom_parameters]
 start_shell = "bool"  # Start a shell during init_early
+python_version = "str"  # Python version to use

ugrd/crypto/cryptsetup.py

@@ -1,6 +1,6 @@
 __author__ = 'desultory'
 
-__version__ = '0.8.2'
+__version__ = '0.9.0'
 
 
 CRYPTSETUP_PARAMETERS = ['key_type', 'partuuid', 'uuid', 'key_file', 'header_file', 'retries', 'key_command', 'reset_command', 'try_nokey']
@@ -159,3 +159,18 @@ def crypt_init(self):
             out += ['fi']
     return out
 
+
+def find_libgcc(self):
+    """
+    Finds libgcc.so, adds a 'dependencies' item for it.
+    Adds the parend 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,x86-64' in lib][0]
+    source_path = Path(libgcc.partition('=> ')[-1])
+    self.logger.debug("Source path for libgcc_s: %s" % source_path)
+
+    self.config_dict['dependencies'] = source_path
+    self.config_dict['library_paths'] = str(source_path.parent)

ugrd/crypto/cryptsetup.toml

@@ -10,6 +10,9 @@ 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" ]
 

ugrd/initramfs_generator.py

@@ -40,7 +40,7 @@ def load_config(self):
             self.logger.debug("Processing config key: %s" % config)
             self.config_dict[config] = value
 
-        self.logger.debug("Loaded config: %s" % self.config_dict)
+        self.logger.debug("Loaded config:\n%s" % self.config_dict)
 
         for parameter in ['build_dir', 'out_dir', 'clean', 'old_count']:
             dict_value = self.config_dict[parameter]