From efeb864cb547a2cbf96dc0053a8bdb4d9190b364 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 12 Jun 2024 05:50:45 +0200 Subject: Merging upstream version 256. Signed-off-by: Daniel Baumann --- mkosi.images/system/mkosi.conf | 48 +++++++++++++++++++++++++++++++++--------- 1 file changed, 38 insertions(+), 10 deletions(-) (limited to 'mkosi.images/system/mkosi.conf') diff --git a/mkosi.images/system/mkosi.conf b/mkosi.images/system/mkosi.conf index 7612f22..562650a 100644 --- a/mkosi.images/system/mkosi.conf +++ b/mkosi.images/system/mkosi.conf @@ -1,48 +1,76 @@ # SPDX-License-Identifier: LGPL-2.1-or-later [Config] -Dependencies=base +InitrdInclude=initrd/ + +[Output] +@Format=directory +RepartDirectories=mkosi.repart [Content] Autologin=yes -BaseTrees=../../mkosi.output/base -ExtraTrees=../../mkosi.output/base-systemd +ExtraTrees= + %D/mkosi.crt:/usr/lib/verity.d/mkosi.crt # sysext verification key + leak-sanitizer-suppressions:/usr/lib/systemd/leak-sanitizer-suppressions + coredump-journal-storage.conf:/usr/lib/systemd/coredump.conf.d/10-coredump-journal-storage.conf + +PostInstallationScripts=mkosi.sanitizers.chroot + +InitrdPackages= + findutils + grep + sed + Packages= acl + attr bash-completion + bpftrace + clang coreutils + curl diffutils dnsmasq dosfstools e2fsprogs findutils - gcc # Sanitizer libraries gdb grep gzip + jq kbd kexec-tools + kmod + knot less + lld + llvm + lvm2 + man + mdadm mtools nano nftables + nvme-cli + opensc openssl + p11-kit + python3 qrencode + radvd + rsync sed socat strace systemd + tar tmux tree udev util-linux valgrind + which wireguard-tools xfsprogs zsh - -BuildPackages= - -[Validation] -@SecureBoot=yes -@SignExpectedPcr=yes + zstd -- cgit v1.2.3