Reorganize obs profile to allow per-distro-release configs

README.md

@@ -44,21 +44,21 @@ run `mkosi -B -ff sysupdate -- update --reboot` which will update the system usi
 
 Sometimes ParticleOS adopts systemd features as soon as they get merged into
 systemd without waiting for an official release. That's why we recommend
-enabling the `obs` profile to enable the systemd repositories on OBS
+enabling the `obs-repos` profile to enable the systemd repositories on OBS
 (https://software.opensuse.org//download.html?project=system%3Asystemd&package=systemd)
 containing systemd packages which are built every day from systemd's git main
 branch.
 
-To enable the `obs` profile, add the following to `mkosi.local.conf`:
+To enable the `obs-repos` profile, add the following to `mkosi.local.conf`:
 
 ```conf
 [Config]
-Profiles=obs
+Profiles=obs-repos
 ```
 
 ## Building systemd from source
 
-As an alternative to using the `obs` profile, you can build systemd from source:
+As an alternative to using the `obs-repos` profile, you can build systemd from source:
 
 ```sh
 git clone https://github.com/systemd/systemd

mkosi.profiles/obs/mkosi.conf.d/debian-tools.conf → mkosi.profiles/obs-repos/mkosi.conf.d/debian/mkosi.conf.d/testing-tools.conf

@@ -5,4 +5,4 @@ ToolsTreeDistribution=debian
 ToolsTreeRelease=testing
 
 [Build]
-ToolsTreeSandboxTrees=debian.sources:/etc/apt/sources.list.d/systemd.sources
+ToolsTreeSandboxTrees=mkosi.conf.d/testing.sources:/etc/apt/sources.list.d/systemd.sources

mkosi.profiles/obs/mkosi.conf.d/debian.conf → mkosi.profiles/obs-repos/mkosi.conf.d/debian/mkosi.conf.d/testing.conf

@@ -5,4 +5,4 @@ Distribution=debian
 Release=testing
 
 [Build]
-SandboxTrees=debian.sources:/etc/apt/sources.list.d/systemd.sources
+SandboxTrees=mkosi.conf.d/testing.sources:/etc/apt/sources.list.d/systemd.sources

mkosi.profiles/obs-repos/mkosi.conf.d/debian/mkosi.conf.d/trixie-tools.conf

@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+ToolsTreeDistribution=debian
+ToolsTreeRelease=trixie
+
+[Build]
+ToolsTreeSandboxTrees=mkosi.conf.d/trixie.sources:/etc/apt/sources.list.d/systemd.sources

mkosi.profiles/obs-repos/mkosi.conf.d/debian/mkosi.conf.d/trixie.conf

@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=debian
+Release=trixie
+
+[Build]
+SandboxTrees=mkosi.conf.d/trixie.sources:/etc/apt/sources.list.d/systemd.sources

mkosi.profiles/obs-repos/mkosi.conf.d/debian/mkosi.conf.d/trixie.sources

@@ -0,0 +1,46 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+Types: deb
+URIs: http://download.opensuse.org/repositories/system:/systemd/Debian_13/
+Suites: /
+Signed-By: 
+ -----BEGIN PGP PUBLIC KEY BLOCK-----
+ .
+ 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
+ eaFoffTr4S8HomntcGNWIXat26E55VAETAWYFtI=
+ =/SNl
+ -----END PGP PUBLIC KEY BLOCK-----

mkosi.profiles/obs-repos/mkosi.conf.d/fedora/mkosi.conf.d/43-tools.conf

@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+ToolsTreeDistribution=fedora
+ToolsTreeRelease=43
+
+[Build]
+ToolsTreeSandboxTrees=systemd.gpg:/usr/share/pki/rpm-gpg/systemd.gpg
+                      43.repo:/etc/yum.repos.d/systemd.repo

mkosi.profiles/obs-repos/mkosi.conf.d/fedora/mkosi.conf.d/43.conf

@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Distribution=fedora
+Release=43
+
+[Build]
+SandboxTrees=systemd.gpg:/usr/share/pki/rpm-gpg/systemd.gpg
+             mkosi.conf.d/43.repo:/etc/yum.repos.d/systemd.repo

mkosi.profiles/obs-repos/mkosi.conf.d/fedora/mkosi.conf.d/43.repo

@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[systemd]
+name=systemd packages built from upstream main (Fedora_43)
+type=rpm-md
+baseurl=https://download.opensuse.org/repositories/system:/systemd/Fedora_43/
+gpgcheck=1
+gpgkey=file:///usr/share/pki/rpm-gpg/systemd.gpg
+enabled=1

mkosi.profiles/obs/mkosi.conf.d/fedora-tools.conf → mkosi.profiles/obs-repos/mkosi.conf.d/fedora/mkosi.conf.d/rawhide-tools.conf

@@ -6,4 +6,4 @@ ToolsTreeRelease=rawhide
 
 [Build]
 ToolsTreeSandboxTrees=systemd.gpg:/usr/share/pki/rpm-gpg/systemd.gpg
-                      fedora.repo:/etc/yum.repos.d/systemd.repo
+                      rawhide.repo:/etc/yum.repos.d/systemd.repo

mkosi.profiles/obs/mkosi.conf.d/fedora.conf → mkosi.profiles/obs-repos/mkosi.conf.d/fedora/mkosi.conf.d/rawhide.conf

@@ -6,4 +6,4 @@ Release=rawhide
 
 [Build]
 SandboxTrees=systemd.gpg:/usr/share/pki/rpm-gpg/systemd.gpg
-             fedora.repo:/etc/yum.repos.d/systemd.repo
+             mkosi.conf.d/rawhide.repo:/etc/yum.repos.d/systemd.repo