diff options
author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-10-04 14:22:35 +0200 |
---|---|---|
committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-10-09 20:36:57 +0200 |
commit | 963157ca78429c51feb3103828d8cc94440956f3 (patch) | |
tree | 0b7f3b31166970d2b488b7b29a042ce14d9de80a /mkosi.conf | |
parent | mkosi: Update to latest (diff) | |
download | systemd-963157ca78429c51feb3103828d8cc94440956f3.tar.xz systemd-963157ca78429c51feb3103828d8cc94440956f3.zip |
mkosi: Fix sections for settings
Upstream we moved settings around a bit to different sections, let's
adapt to those changes in the systemd repo.
Diffstat (limited to 'mkosi.conf')
-rw-r--r-- | mkosi.conf | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mkosi.conf b/mkosi.conf index 3e33410c71..b76cefe0df 100644 --- a/mkosi.conf +++ b/mkosi.conf @@ -26,16 +26,18 @@ PassEnvironment= [Output] RepartDirectories=mkosi.repart OutputDirectory=build/mkosi.output + +[Build] BuildDirectory=build/mkosi.builddir CacheDirectory=build/mkosi.cache +BuildSourcesEphemeral=yes +Incremental=yes # TODO: Remove when TEST-70-TPM doesn't fail in an image with signed PCRs anymore. [Validation] SignExpectedPcr=no [Content] -BuildSourcesEphemeral=yes - ExtraTrees= mkosi.crt:/usr/lib/verity.d/mkosi.crt # sysext verification key mkosi.leak-sanitizer-suppressions:/usr/lib/systemd/leak-sanitizer-suppressions @@ -141,11 +143,9 @@ Credentials= tty.serial.hvc0.login.noauth=yes tty.console.agetty.autologin=root tty.console.login.noauth=yes -Incremental=yes RuntimeBuildSources=yes RuntimeScratch=no QemuSmp=2 QemuSwtpm=yes QemuVsock=yes QemuKvm=yes -ToolsTreePackages=virtiofsd |