mkosi: Introduce build image

We want the exitrd image to be built with the latest systemd as well.
As the exitrd image is built as part of mkosi.images, and all subimages
are built before the main image, this implies the packages must be built
as a subimage in mkosi.images/ as well. So we introduce the build image and
move all logic related to building distribution packages there.

This also has the nice side effect of slimming down the main image as the
build dependencies are not installed into the main image anymore. It also
makes sure the packages are built in a "clean" chroot without any of the
other packages which we install in the main image available.

1 files changed, 26 insertions, 15 deletions

diff --git a/mkosi.conf b/mkosi.conf
index b47b30c98b..5654af0956 100644
--- a/mkosi.conf
+++ b/mkosi.conf
@@ -3,6 +3,24 @@
 [Config]
 MinimumVersion=23~devel
 InitrdInclude=mkosi.initrd/
+Dependencies=
+        exitrd
+        minimal-base
+        minimal-0
+        minimal-1
+
+PassEnvironment=
+        NO_BUILD
+        NO_SYNC
+        WIPE
+        SANITIZERS
+        CFLAGS
+        LDFLAGS
+        LLVM
+        MESON_VERBOSE
+        MESON_OPTIONS
+        SYSEXT
+        WITH_DEBUG
 
 [Output]
 RepartDirectories=mkosi.repart
@@ -14,11 +32,18 @@ CacheDirectory=build/mkosi.cache
 BuildSourcesEphemeral=yes
 Autologin=yes
 
-PostInstallationScripts=mkosi.sanitizers.chroot
 ExtraTrees=
         mkosi.crt:/usr/lib/verity.d/mkosi.crt # sysext verification key
         mkosi.leak-sanitizer-suppressions:/usr/lib/systemd/leak-sanitizer-suppressions
         mkosi.coredump-journal-storage.conf:/usr/lib/systemd/coredump.conf.d/10-coredump-journal-storage.conf
+        %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
 
 Environment=
         SYSTEMD_REPART_OVERRIDE_FSTYPE_ROOT=%F
@@ -57,16 +82,6 @@ KernelCommandLine=systemd.crash_shell
 KernelModulesInitrdExclude=.*
 KernelModulesInitrdInclude=default
 
-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
-
 InitrdPackages=
         btrfs-progs
         findutils
@@ -79,7 +94,6 @@ Packages=
         bash-completion
         bpftrace
         btrfs-progs
-        clang
         coreutils
         curl
         diffutils
@@ -97,8 +111,6 @@ Packages=
         kmod
         knot
         less
-        lld
-        llvm
         lvm2
         man
         mdadm
@@ -117,7 +129,6 @@ Packages=
         sed
         socat
         strace
-        systemd
         tar
         tmux
         tree