From: Paymon MARANDI Date: Fri, 5 May 2023 15:23:48 +0000 (-0400) Subject: gentoo: build initrd, do not ask for udev X-Git-Tag: v15~103^2~33 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56f5914e2d1454d04903644bf54527e67fec6b02;p=thirdparty%2Fmkosi.git gentoo: build initrd, do not ask for udev udev is always included with systemd Signed-off-by: Paymon MARANDI --- diff --git a/mkosi/__init__.py b/mkosi/__init__.py index e6b9e5bc2..85a703bbf 100644 --- a/mkosi/__init__.py +++ b/mkosi/__init__.py @@ -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", diff --git a/mkosi/util.py b/mkosi/util.py index 2317e2cab..c15ac9908 100644 --- a/mkosi/util.py +++ b/mkosi/util.py @@ -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"