From e165a553292c30967f9aadc39c27cd18e310c187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Thu, 25 Jan 2024 12:46:37 +0100 Subject: [PATCH] Reapply "fedora-common-ostree: Enable bootupd integration" Now that we're building using unified core and that Anaconda has support for bootupd, we can enable bootupd in Silverblue & friends. See: https://fedoraproject.org/wiki/Changes/FedoraSilverblueBootupd See: https://fedoraproject.org/wiki/Changes/FedoraSilverblueUnifiedCore See: https://github.com/fedora-silverblue/issue-tracker/issues/530 Previous attempts: - https://pagure.io/workstation-ostree-config/pull-request/288 - https://pagure.io/workstation-ostree-config/pull-request/293 - https://pagure.io/workstation-ostree-config/pull-request/307 - https://pagure.io/workstation-ostree-config/pull-request/313 (revert) - https://pagure.io/workstation-ostree-config/pull-request/330 - https://pagure.io/workstation-ostree-config/pull-request/402 (revert) - https://pagure.io/workstation-ostree-config/pull-request/403 - https://pagure.io/workstation-ostree-config/pull-request/452 (revert) This reverts commit 148b6d236ce2d583083886944d415f481844c46b. --- fedora-common-ostree.yaml | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml index d5ee82f..046b764 100644 --- a/fedora-common-ostree.yaml +++ b/fedora-common-ostree.yaml @@ -10,12 +10,10 @@ container-cmd: include: fedora-common-ostree-pkgs.yaml # See https://github.com/coreos/bootupd -# TODO: Disabled until we use use unified-core or native container flow -# for the main build -# arch-include: -# x86_64: bootupd.yaml -# aarch64: bootupd.yaml -# ppc64le: bootupd.yaml +arch-include: + x86_64: bootupd.yaml + aarch64: bootupd.yaml + ppc64le: bootupd.yaml packages: # Ensure that we have a kernel. Kernel packages are not in any comps group