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 3e33410c71f6e0ec5fbc4342c9265869c8e59895..b76cefe0dfd52acebdd17693900e46d77b8fcf1d 100644 (file)
--- 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 0a388f3c08181aa27b7ab3ea89ae91ebb452f536..137130e5698f67128e21bfb48e48b59dfa94ba04 100644 (file)
--- 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 dd462efcee38c6ccf57f9311204ca70ef09530c2..d2178315a2916a13b73146c9c9174045f235e24a 100644 (file)
--- 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 62d052360ab5e7207f562d651f1d6622244c8c3d..ecbb02ba6159c34014f60e69a6076562da226156 100644 (file)
--- 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 ced3ea4108867995dff0e071bc4355cc62b3de99..fc902855615ec06203cf6964493cc84169da36cb 100644 (file)
--- 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 1efca6d4b2a5d17ba2f36fd89a22f04fa356f96b..0f4a79652cb2bf24cde4355b08ec6ce9b430f2a3 100644 (file)
--- 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 29727d7e2207424114e0e1bb8276631ea1de19c8..2351aaa6ce931298f7964bcda7a742417e4f5d19 100644 (file)
--- 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 0b174356723b22eca9cfb098632e276eeff25157..a4882df8b14a5b030c7851d34f52c9bb7c839e36 100644 (file)
--- 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 28da8a592b81144a93b117a6dd8bcafd4d1275b4..ea4fc806bf38243fe9457c85fd01d81086c50635 100644 (file)
--- 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 3f2c5c77ce0152f9580db100fae1d79296030e6c..ca28c123afd0429536e2d5b52a7fda889eab86a5 100644 (file)
--- 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 5ef80b8bc79355cf0f647580f769ca146b68f194..5d6717f897bd3bf493ea872b4740ba6147cc66a3 100644 (file)
--- 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 5ef80b8bc79355cf0f647580f769ca146b68f194..5d6717f897bd3bf493ea872b4740ba6147cc66a3 100644 (file)
--- 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 d841f9b76b59dd9f2c2cc219e39a9b0ed70fd58f..56040f8b21ea47b10b9ddc27b4ddef14affa7bc4 100644 (file)
--- 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