From: Daan De Meyer Date: Fri, 4 Oct 2024 12:22:35 +0000 (+0200) Subject: mkosi: Fix sections for settings X-Git-Tag: v257-rc1~276^2 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=963157ca78429c51feb3103828d8cc94440956f3;p=thirdparty%2Fsystemd.git 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. --- diff --git a/mkosi.conf b/mkosi.conf index 3e33410c71f..b76cefe0dfd 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 diff --git a/mkosi.conf.d/10-centos-fedora/mkosi.conf.d/10-selinux.conf b/mkosi.conf.d/10-centos-fedora/mkosi.conf.d/10-selinux.conf index 0a388f3c081..137130e5698 100644 --- a/mkosi.conf.d/10-centos-fedora/mkosi.conf.d/10-selinux.conf +++ b/mkosi.conf.d/10-centos-fedora/mkosi.conf.d/10-selinux.conf @@ -3,9 +3,6 @@ # libselinux does not work in the slightest with /usr-only images so don't install the packages if we're # building a /usr-only image. -[Match] -Profile=!particle - [Content] Packages= selinux-policy diff --git a/mkosi.conf.d/10-centos/mkosi.conf b/mkosi.conf.d/10-centos/mkosi.conf index dd462efcee3..d2178315a29 100644 --- a/mkosi.conf.d/10-centos/mkosi.conf +++ b/mkosi.conf.d/10-centos/mkosi.conf @@ -6,7 +6,7 @@ Distribution=centos [Distribution] Release=10 -[Content] +[Build] Environment= # CentOS doesn't support btrfs so we have to use something else. We'd prefer to use XFS here but it # fails to mount on duplicate filesystem UUIDs which happens when running tests in parallel so we use @@ -16,5 +16,6 @@ Environment= # mkfs.ext4 enabled it by default, so we disable it explicitly. SYSTEMD_REPART_MKFS_OPTIONS_EXT4="-O ^orphan_file" +[Content] Packages= kernel-modules # For squashfs diff --git a/mkosi.conf.d/20-sanitizers.conf b/mkosi.conf.d/20-sanitizers.conf index 62d052360ab..ecbb02ba615 100644 --- a/mkosi.conf.d/20-sanitizers.conf +++ b/mkosi.conf.d/20-sanitizers.conf @@ -4,13 +4,15 @@ Environment=SANITIZERS Environment=!SANITIZERS= -[Content] +[Build] # Set verify_asan_link_order=0 to prevent ASAN warnings when building the image and make sure the real ASAN # options are set when booting the image. # Set intercept_tls_get_addr=0 to work around leak sanitizer segmentation fault in test-dlopen-so on CentOS # Stream 9. # TODO: Drop intercept_tls_get_addr=0 when we remove CentOS Stream 9 builds. Environment=ASAN_OPTIONS=verify_asan_link_order=0:intercept_tls_get_addr=0 + +[Content] KernelCommandLine= ASAN_OPTIONS=strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1:disable_coredump=0:use_madv_dontdump=1 systemd.setenv=ASAN_OPTIONS=strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1:disable_coredump=0:use_madv_dontdump=1 @@ -19,5 +21,5 @@ KernelCommandLine= LSAN_OPTIONS=suppressions=/usr/lib/systemd/leak-sanitizer-suppressions systemd.setenv=LSAN_OPTIONS=suppressions=/usr/lib/systemd/leak-sanitizer-suppressions -[Config] +[Include] Include=%D/mkosi.sanitizers diff --git a/mkosi.images/build/mkosi.conf.d/arch/mkosi.conf b/mkosi.images/build/mkosi.conf.d/arch/mkosi.conf index ced3ea41088..fc902855615 100644 --- a/mkosi.images/build/mkosi.conf.d/arch/mkosi.conf +++ b/mkosi.images/build/mkosi.conf.d/arch/mkosi.conf @@ -3,13 +3,14 @@ [Match] Distribution=arch -[Content] +[Build] Environment= GIT_URL=https://gitlab.archlinux.org/archlinux/packaging/packages/systemd.git GIT_BRANCH=main GIT_COMMIT=d5a2dc54dad2bcfefa1032cc95823f1acedfcb4c PKG_SUBDIR=arch +[Content] Packages= base base-devel diff --git a/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf b/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf index 1efca6d4b2a..0f4a79652cb 100644 --- a/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf +++ b/mkosi.images/build/mkosi.conf.d/centos-fedora/mkosi.conf @@ -4,13 +4,14 @@ Distribution=|centos Distribution=|fedora -[Content] +[Build] Environment= GIT_URL=https://src.fedoraproject.org/rpms/systemd.git GIT_BRANCH=rawhide GIT_COMMIT=a67221c3f0d0b81b9b5b3230a71d09044342f1a4 PKG_SUBDIR=fedora +[Content] Packages= compiler-rt git-core diff --git a/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf b/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf index 29727d7e220..2351aaa6ce9 100644 --- a/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf +++ b/mkosi.images/build/mkosi.conf.d/debian-ubuntu/mkosi.conf @@ -4,7 +4,7 @@ Distribution=|debian Distribution=|ubuntu -[Content] +[Build] Environment= GIT_URL=https://salsa.debian.org/systemd-team/systemd.git GIT_SUBDIR=debian @@ -12,6 +12,7 @@ Environment= GIT_COMMIT=51389fefcabae6d1e28153fed84a5e69a9147b19 PKG_SUBDIR=debian +[Content] Packages= apt erofs-utils diff --git a/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf b/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf index 0b174356723..a4882df8b14 100644 --- a/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf +++ b/mkosi.images/build/mkosi.conf.d/opensuse/mkosi.conf @@ -3,13 +3,14 @@ [Match] Distribution=opensuse -[Content] +[Build] Environment= GIT_URL=https://src.opensuse.org/pool/systemd GIT_BRANCH=factory GIT_COMMIT=612bc16021b28ab99002fa1069f1ec97124397a25c7a207d013213b5cfb86055 PKG_SUBDIR=opensuse +[Content] Packages= diffutils erofs-utils diff --git a/mkosi.images/exitrd/mkosi.conf b/mkosi.images/exitrd/mkosi.conf index 28da8a592b8..ea4fc806bf3 100644 --- a/mkosi.images/exitrd/mkosi.conf +++ b/mkosi.images/exitrd/mkosi.conf @@ -13,5 +13,5 @@ MakeInitrd=yes Packages= bash -[Config] +[Include] Include=%D/mkosi.sanitizers diff --git a/mkosi.images/initrd/mkosi.conf b/mkosi.images/initrd/mkosi.conf index 3f2c5c77ce0..ca28c123afd 100644 --- a/mkosi.images/initrd/mkosi.conf +++ b/mkosi.images/initrd/mkosi.conf @@ -1,6 +1,6 @@ # SPDX-License-Identifier: LGPL-2.1-or-later -[Config] +[Include] Include= mkosi-initrd %D/mkosi.sanitizers diff --git a/mkosi.images/minimal-0/mkosi.conf b/mkosi.images/minimal-0/mkosi.conf index 5ef80b8bc79..5d6717f897b 100644 --- a/mkosi.images/minimal-0/mkosi.conf +++ b/mkosi.images/minimal-0/mkosi.conf @@ -7,7 +7,9 @@ Dependencies=minimal-base Format=portable SplitArtifacts=yes +[Build] +Environment=SYSTEMD_REPART_OVERRIDE_FSTYPE=squashfs + [Content] BaseTrees=%O/minimal-base -Environment=SYSTEMD_REPART_OVERRIDE_FSTYPE=squashfs Bootable=no diff --git a/mkosi.images/minimal-1/mkosi.conf b/mkosi.images/minimal-1/mkosi.conf index 5ef80b8bc79..5d6717f897b 100644 --- a/mkosi.images/minimal-1/mkosi.conf +++ b/mkosi.images/minimal-1/mkosi.conf @@ -7,7 +7,9 @@ Dependencies=minimal-base Format=portable SplitArtifacts=yes +[Build] +Environment=SYSTEMD_REPART_OVERRIDE_FSTYPE=squashfs + [Content] BaseTrees=%O/minimal-base -Environment=SYSTEMD_REPART_OVERRIDE_FSTYPE=squashfs Bootable=no diff --git a/mkosi.images/minimal-base/mkosi.conf b/mkosi.images/minimal-base/mkosi.conf index d841f9b76b5..56040f8b21e 100644 --- a/mkosi.images/minimal-base/mkosi.conf +++ b/mkosi.images/minimal-base/mkosi.conf @@ -15,5 +15,5 @@ Packages= grep util-linux -[Config] +[Include] Include=%D/mkosi.sanitizers