From 65ff51cd8a00226bc523f2439924eb0d6355669d Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Thu, 19 Oct 2023 12:27:43 +0200 Subject: [PATCH] Don't store default initrd artifacts in output directory We don't use these for anything and the initrd can already be accessed using the split initrd, so let's not store the default initrd artifacts in the output directory. --- mkosi/__init__.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/mkosi/__init__.py b/mkosi/__init__.py index 6ff7a01b7..5b2d76778 100644 --- a/mkosi/__init__.py +++ b/mkosi/__init__.py @@ -1002,10 +1002,6 @@ def gen_kernel_images(state: MkosiState) -> Iterator[tuple[str, Path]]: def build_initrd(state: MkosiState) -> Path: - symlink = state.workspace / "initrd" - if symlink.exists(): - return symlink.resolve() - if state.config.distribution == Distribution.custom: die("Building a default initrd is not supported for custom distributions") @@ -1030,7 +1026,7 @@ def build_initrd(state: MkosiState) -> Path: *(["--compress-output", str(state.config.compress_output)] if state.config.compress_output else []), "--with-network", str(state.config.with_network), "--cache-only", str(state.config.cache_only), - *(["--output-dir", str(state.config.output_dir)] if state.config.output_dir else []), + "--output-dir", str(state.workspace / "initrd"), *(["--workspace-dir", str(state.config.workspace_dir)] if state.config.workspace_dir else []), "--cache-dir", str(state.cache_dir.parent), *(["--local-mirror", str(state.config.local_mirror)] if state.config.local_mirror else []), @@ -1064,14 +1060,18 @@ def build_initrd(state: MkosiState) -> Path: "build", ] + args, [config] = parse_config(cmdline) + assert config.output_dir + + config.output_dir.mkdir(exist_ok=True) + + if (config.output_dir / config.output).exists(): + return config.output_dir / config.output + with complete_step("Building initrd"): - args, [config] = parse_config(cmdline) - unlink_output(args, config) build_image(args, config) - symlink.symlink_to(config.output_dir_or_cwd() / config.output) - - return symlink + return config.output_dir / config.output def build_kernel_modules_initrd(state: MkosiState, kver: str) -> Path: -- 2.47.2