From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Tue, 25 Feb 2025 14:10:31 +0000 (+0000)
Subject: mkosi-obs: rearrange settings into a subfile that is only for Profile=main
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F3554%2Fhead;p=thirdparty%2Fmkosi.git

mkosi-obs: rearrange settings into a subfile that is only for Profile=main

These cannot be used with subimages, so move them down one level
---

diff --git a/mkosi/resources/mkosi-obs/mkosi.conf b/mkosi/resources/mkosi-obs/mkosi.conf
index d44afb8af..0c278578a 100644
--- a/mkosi/resources/mkosi-obs/mkosi.conf
+++ b/mkosi/resources/mkosi-obs/mkosi.conf
@@ -1,25 +1,13 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 [Build]
-SandboxTrees=/usr/src/packages/SOURCES:/usr/src/packages/SOURCES
-BuildSources=/usr/src/packages/OTHER:/usr/src/packages/OTHER
-ToolsTree=
 History=no
-CacheDirectory=
-Incremental=no
-WithNetwork=never
-
-[Distribution]
-RepositoryKeyCheck=no
-LocalMirror=file:///.build.binaries/
 
 [Output]
-OutputDirectory=
-Checksum=yes
 SplitArtifacts=pcrs,roothash,os-release
 CompressOutput=zstd
 
 [Validation]
-SignExpectedPcrCertificate=/usr/src/packages/SOURCES/_projectcert.crt
 SecureBoot=no
 SignExpectedPcr=no
 Verity=defer
+Checksum=yes
diff --git a/mkosi/resources/mkosi-obs/mkosi.conf.d/main.conf b/mkosi/resources/mkosi-obs/mkosi.conf.d/main.conf
new file mode 100644
index 000000000..9be3c88dd
--- /dev/null
+++ b/mkosi/resources/mkosi-obs/mkosi.conf.d/main.conf
@@ -0,0 +1,22 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Image=main
+
+[Build]
+SandboxTrees=/usr/src/packages/SOURCES:/usr/src/packages/SOURCES
+BuildSources=/usr/src/packages/OTHER:/usr/src/packages/OTHER
+ToolsTree=
+CacheDirectory=
+Incremental=no
+WithNetwork=never
+
+[Distribution]
+RepositoryKeyCheck=no
+LocalMirror=file:///.build.binaries/
+
+[Output]
+OutputDirectory=
+
+[Validation]
+SignExpectedPcrCertificate=/usr/src/packages/SOURCES/_projectcert.crt