From 51018ed1c207348ad9f54f7e9d53f628ca11b34a Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Mon, 3 Jun 2024 11:17:48 +0200 Subject: [PATCH] mkosi: Make system dependencies conditional on format If the none format is specified, we don't use the extra trees at all so let's make the dependencies on the subimages conditional on Format= not being set to "none". This speeds up builds when using Format=none. --- mkosi.images/system/mkosi.conf | 17 +-------------- .../system/mkosi.conf.d/20-images.conf | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+), 16 deletions(-) create mode 100644 mkosi.images/system/mkosi.conf.d/20-images.conf diff --git a/mkosi.images/system/mkosi.conf b/mkosi.images/system/mkosi.conf index 5d33cba7ee8..aad7984ba36 100644 --- a/mkosi.images/system/mkosi.conf +++ b/mkosi.images/system/mkosi.conf @@ -1,14 +1,7 @@ # SPDX-License-Identifier: LGPL-2.1-or-later [Config] -Dependencies= - exitrd - minimal-base - minimal-0 - minimal-1 - -InitrdInclude= - initrd/ +InitrdInclude=initrd/ [Output] @Format=directory @@ -18,14 +11,6 @@ RepartDirectories=mkosi.repart Autologin=yes ExtraTrees= %D/mkosi.crt:/usr/lib/verity.d/mkosi.crt # sysext verification key - %O/minimal-0.root-%a.raw:/usr/share/minimal_0.raw - %O/minimal-0.root-%a-verity.raw:/usr/share/minimal_0.verity - %O/minimal-0.root-%a-verity-sig.raw:/usr/share/minimal_0.verity.sig - %O/minimal-1.root-%a.raw:/usr/share/minimal_1.raw - %O/minimal-1.root-%a-verity.raw:/usr/share/minimal_1.verity - %O/minimal-1.root-%a-verity-sig.raw:/usr/share/minimal_1.verity.sig - %O/minimal-base:/usr/share/TEST-13-NSPAWN-container-template - %O/exitrd:/exitrd leak-sanitizer-suppressions:/usr/lib/systemd/leak-sanitizer-suppressions PostInstallationScripts=mkosi.sanitizers.chroot diff --git a/mkosi.images/system/mkosi.conf.d/20-images.conf b/mkosi.images/system/mkosi.conf.d/20-images.conf new file mode 100644 index 00000000000..70c15eb0a93 --- /dev/null +++ b/mkosi.images/system/mkosi.conf.d/20-images.conf @@ -0,0 +1,21 @@ +# SPDX-License-Identifier: LGPL-2.1-or-later + +[Match] +Format=!none + +[Config] +Dependencies= + exitrd + minimal-base + minimal-0 + minimal-1 + +ExtraTrees= + %O/minimal-0.root-%a.raw:/usr/share/minimal_0.raw + %O/minimal-0.root-%a-verity.raw:/usr/share/minimal_0.verity + %O/minimal-0.root-%a-verity-sig.raw:/usr/share/minimal_0.verity.sig + %O/minimal-1.root-%a.raw:/usr/share/minimal_1.raw + %O/minimal-1.root-%a-verity.raw:/usr/share/minimal_1.verity + %O/minimal-1.root-%a-verity-sig.raw:/usr/share/minimal_1.verity.sig + %O/minimal-base:/usr/share/TEST-13-NSPAWN-container-template + %O/exitrd:/exitrd -- 2.47.3