From 6d82501bcae74b2db5b785ad56f27aebac5c07f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Fri, 10 Feb 2023 20:57:43 +0100 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. Requires: https://pagure.io/pungi/pull-request/1626 Requires: https://pagure.io/workstation-ostree-config/pull-request/246 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 Revert "Revert "Use unified core mode for Silverblue & Kinoite"" See: https://pagure.io/pungi-fedora/pull-request/1115 See: https://pagure.io/pungi-fedora/pull-request/1136 This reverts commit dd54ad9f33099d795bf5501ef5704c197bb1d456. Signed-off-by: Timothée Ravier tim@siosm.fr --- fedora.conf | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/fedora.conf b/fedora.conf index aa8cc02..decb716 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", @@ -765,6 +766,7 @@ ostree = { "^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", @@ -778,6 +780,7 @@ ostree = { "^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", @@ -791,6 +794,7 @@ ostree = { "^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",