From: Daan De Meyer Date: Mon, 20 Jun 2022 12:28:31 +0000 (+0200) Subject: debian/ubuntu: Handle scenario where systemd-boot is a split package X-Git-Tag: v13~10^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1017%2Fhead;p=thirdparty%2Fmkosi.git debian/ubuntu: Handle scenario where systemd-boot is a split package Recent version of systemd in Debian/Ubuntu made systemd-boot a split package. Let's make sure we handle this case correctly. --- diff --git a/mkosi/__init__.py b/mkosi/__init__.py index ff957161f..69b5ae4e1 100644 --- a/mkosi/__init__.py +++ b/mkosi/__init__.py @@ -2932,6 +2932,12 @@ def install_debian_or_ubuntu(args: MkosiArgs, root: Path, *, do_run_build_script install_skeleton_trees(args, root, False, late=True) invoke_apt(args, do_run_build_script, root, "update", []) + + if args.bootable and not do_run_build_script and args.get_partition(PartitionIdentifier.esp): + if run_workspace_command(args, root, ["apt-cache", "search", "--names-only", "^systemd-boot$"], + capture_stdout=True).stdout.strip() != "": + add_packages(args, extra_packages, "systemd-boot") + invoke_apt(args, do_run_build_script, root, "install", ["--no-install-recommends", *extra_packages]) policyrcd.unlink()