]> git.ipfire.org Git - thirdparty/mkosi.git/commitdiff
gentoo: build initrd, do not ask for udev
authorPaymon MARANDI <Paymon MARANDI darwinskernel@gmail.com>
Fri, 5 May 2023 15:23:48 +0000 (11:23 -0400)
committerPaymon MARANDI <darwinskernel@gmail.com>
Fri, 23 Jun 2023 13:31:40 +0000 (09:31 -0400)
udev is always included with systemd

Signed-off-by: Paymon MARANDI <darwinskernel@gmail.com>
mkosi/__init__.py
mkosi/util.py

index e6b9e5bc28349b691c1ebfd9aaf965b51327e215..85a703bbf0a02b9e6109f244c39e6bbeea7b833f 100644 (file)
@@ -50,6 +50,7 @@ from mkosi.util import (
     format_bytes,
     format_rlimit,
     is_apt_distribution,
+    is_portage_distribution,
     prepend_to_environ_path,
 )
 
@@ -844,7 +845,7 @@ def install_unified_kernel(state: MkosiState, roothash: Optional[str]) -> None:
                 "--acl", yes_no(state.config.acl),
                 "--format", "cpio",
                 "--package", "systemd",
-                "--package", "udev",
+                *(["--package", "udev"] if not is_portage_distribution(state.config.distribution) else []),
                 "--package", "kmod",
                 *(["--package", "dmsetup"] if is_apt_distribution(state.config.distribution) else []),
                 "--output", f"{state.config.output}-initrd",
index 2317e2cab0a76b06b64101606bf6b9df47592033..c15ac9908a5fac8db36aa3b4044300d06862950e 100644 (file)
@@ -169,6 +169,10 @@ def is_apt_distribution(d: Distribution) -> bool:
     return d in (Distribution.debian, Distribution.ubuntu)
 
 
+def is_portage_distribution(d: Distribution) -> bool:
+    return d in (Distribution.gentoo,)
+
+
 class OutputFormat(str, enum.Enum):
     directory = "directory"
     tar = "tar"