Merge pull request #300 from desultory/dev

Add musl_libc toggle, regenerate ld.so.cache within the initrd

Author: desultory

docs/configuration.md

@@ -43,6 +43,7 @@ Modules write to a shared config dict that is accessible by other modules.
 * `build_logging` (false) Enables additional logging during the build process.
 * `make_nodes` (false) Create real device nodes in the build dir. 
 * `find_libgcc` (true) Automatically locates libgcc using ldconfig -p and adds it to the initramfs.
+* `musl_libc` (false) Disable ldconfig -p usage for libgcc detection, skip ld.so.cache regeneration.
 * `out_dir` (initramfs_out) If relative, it will be placed under `tmpdir`, defines the output directory.
 * `out_file` Sets the name of the output file, under `out_dir`.
 * `clean` (true) forces the build dir to be cleaned on each run.

src/ugrd/base/base.toml

@@ -8,7 +8,7 @@ modules = [ "ugrd.base.core",
 
 binaries = [ "awk", "bc", "dd", "grep", "ls", "cp", "cat", "stty", "switch_root", "rm" ]
 
-paths = [ "root", "tmp" ]
+paths = [ "etc", "root", "tmp" ]
 
 loglevel = 5
 shebang_args = "-l"

src/ugrd/base/core.py

@@ -1,5 +1,5 @@
 __author__ = "desultory"
-__version__ = "4.5.1"
+__version__ = "4.6.0"
 
 from os import environ, makedev, mknod, uname
 from pathlib import Path
@@ -303,6 +303,7 @@ def deploy_nodes(self) -> None:
             raise e
 
 
+@unset("musl_libc", "Skipping libgcc_s dependency resolution, musl_libc is enabled.", log_level=20)
 @contains("find_libgcc", "Skipping libgcc_s dependency resolution", log_level=20)
 def autodetect_libgcc(self) -> None:
     """Finds libgcc.so, adds a 'dependencies' item for it.
@@ -318,7 +319,9 @@ def autodetect_libgcc(self) -> None:
         musl_warning = True
 
     if musl_warning:
-        self.logger.warning("This check can be disabled by setting `find_libgcc = false` in the configuration.")
+        self.logger.warning(
+            "This check can be disabled by setting `musl_libc = true` or `find_libgcc = false` in the configuration."
+        )
         return self.logger.warning("Unable to run ldconfig -p, if glibc is being used, this is fatal!")
 
     if cmd.returncode != 0:
@@ -343,6 +346,18 @@ def autodetect_musl(self) -> None:
     if musl_path.exists():
         self.logger.info("Detected musl search path: %s" % c_(musl_path, "cyan"))
         self["dependencies"] = musl_path
+    elif self["musl_libc"]:
+        raise AutodetectError("Musl libc is enabled, but the musl search path was not found: %s" % musl_path)
+
+
+@unset("musl_libc", "Skipping ld.so.cache regeneration, musl_libc is enabled.", log_level=30)
+def regen_ld_so_cache(self) -> None:
+    """Regenerates the ld.so.cache file in the build dir. Uses defined library paths to generate the config"""
+    self.logger.info("Regenerating ld.so.cache")
+    self._write("etc/ld.so.conf", self["library_paths"])
+    build_path = self._get_build_path("/")
+    self._run(["ldconfig", "-r", str(build_path)])
+    self["check_included_or_mounted"] = "etc/ld.so.cache"
 
 
 def _process_out_file(self, out_file: str) -> None:

src/ugrd/base/core.toml

@@ -50,6 +50,9 @@ timeout = 15
 		     "deploy_symlinks",
 		     "deploy_nodes"]
 
+[imports.build_final]
+"ugrd.base.core" = [ "regen_ld_so_cache" ]
+
 [custom_parameters]
 hostonly = "bool"  # If true, the initramfs will be built specifically for the host building it
 validate = "bool"  # If true, the configuration of the initramfs will be validated against the host
@@ -70,6 +73,7 @@ zstd_dependencies = "NoDupFlatList"  # ZStandard compressed dependencies propert
 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
+musl_libc = "bool"  # If true, disables find_libgcc and regen_ld_so_cache
 libraries = "NoDupFlatList"  # Additional libraries, by name, added to the initramfs
 binaries = "NoDupFlatList"  # Binaries which should be included in the intiramfs, dependencies resolved with lddtree
 binary_search_paths = "NoDupFlatList"  # Binary paths, used to define the paths to search for binaries

src/ugrd/fs/test_image.toml

@@ -20,4 +20,4 @@ cryptsetup = "dict"  # Same as above
 _cryptsetup_root = "str"  # Define the root device for cryptsetup
 test_image_size = "int"  # Define the size of the test image in MiB
 test_flag = "str"  # Define the success flag used to determine if the test was successful
-
+check_included_or_mounted = "NoDupFlatList"  # Only defined to suppress errors about unknown config