From ae2c12886a5fa9098a5cf88d2c51674565143dda Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= <tim@siosm.fr>
Date: Wed, 19 Jul 2023 18:25:18 +0200
Subject: [PATCH] Silverblue/Kinoite/Sericea/Onyx: Use unified core mode
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

rpm-ostree is moving to unified core composes and this is now working
for Silverblue, Kinoite, Sericea and Onyx.

See: https://github.com/coreos/rpm-ostree/issues/729
See: https://fedoraproject.org/wiki/Changes/FedoraSilverblueUnifiedCore
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2150984

Related changes:
- https://pagure.io/workstation-ostree-config/pull-request/246
- https://pagure.io/workstation-ostree-config/pull-request/344

Changes in Pungi:
- https://pagure.io/pungi/pull-request/1626
- https://pagure.io/pungi/pull-request/1690

For previous attempts, see:
- https://pagure.io/pungi-fedora/pull-request/1115
- https://pagure.io/pungi-fedora/pull-request/1136 (revert)
- https://pagure.io/pungi-fedora/pull-request/1145
- https://pagure.io/pungi-fedora/pull-request/1185 (revert)

Signed-off-by: Timothée Ravier tim@siosm.fr
---
 fedora.conf | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/fedora.conf b/fedora.conf
index aa8cc02..da1bef9 100644
--- a/fedora.conf
+++ b/fedora.conf
@@ -752,6 +752,7 @@ ostree = {
     "^Silverblue$": {
         "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
         "force_new_commit": True,
+        "unified_core": True,
         "treefile": "fedora-silverblue.yaml",
         "config_url": "https://pagure.io/workstation-ostree-config.git",
         "config_branch": "main",
@@ -759,12 +760,14 @@ ostree = {
         "tag_ref": False,
         "ostree_repo": "/mnt/koji/compose/ostree/repo/",
         "ostree_ref": "fedora/rawhide/${basearch}/silverblue",
+        "runroot_packages": ["selinux-policy-targeted"],
         "arches": ["x86_64", "ppc64le", "aarch64"],
         "failable": ['*'],
     },
     "^Kinoite$": {
         "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
         "force_new_commit": True,
+        "unified_core": True,
         "treefile": "fedora-kinoite.yaml",
         "config_url": "https://pagure.io/workstation-ostree-config.git",
         "config_branch": "main",
@@ -772,12 +775,14 @@ ostree = {
         "tag_ref": False,
         "ostree_repo": "/mnt/koji/compose/ostree/repo/",
         "ostree_ref": "fedora/rawhide/${basearch}/kinoite",
+        "runroot_packages": ["selinux-policy-targeted"],
         "arches": ["x86_64", "ppc64le", "aarch64"],
         "failable": ['*'],
     },
     "^Sericea$": {
         "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
         "force_new_commit": True,
+        "unified_core": True,
         "treefile": "fedora-sericea.yaml",
         "config_url": "https://pagure.io/workstation-ostree-config.git",
         "config_branch": "main",
@@ -785,12 +790,14 @@ ostree = {
         "tag_ref": False,
         "ostree_repo": "/mnt/koji/compose/ostree/repo/",
         "ostree_ref": "fedora/rawhide/${basearch}/sericea",
+        "runroot_packages": ["selinux-policy-targeted"],
         "arches": ["x86_64", "ppc64le", "aarch64"],
         "failable": ['*'],
     },
     "^Onyx$": {
         "version": "!OSTREE_VERSION_FROM_LABEL_DATE_TYPE_RESPIN",
         "force_new_commit": True,
+        "unified_core": True,
         "treefile": "fedora-onyx.yaml",
         "config_url": "https://pagure.io/workstation-ostree-config.git",
         "config_branch": "main",
@@ -798,6 +805,7 @@ ostree = {
         "tag_ref": False,
         "ostree_repo": "/mnt/koji/compose/ostree/repo/",
         "ostree_ref": "fedora/rawhide/${basearch}/onyx",
+        "runroot_packages": ["selinux-policy-targeted"],
         "arches": ["x86_64"],
         "failable": ['*'],
     }