From 7cb85a8baaa201e6d5c635921174a5a794e97501 Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Oct 18 2022 18:29:17 +0000
Subject: Add bootupd integration


This does what we should have done originally, and copies the
bootupd bits directly from
https://github.com/coreos/fedora-coreos-config/blob/testing-devel/manifests/bootupd.yaml

And uses them via includes.

(cherry picked from commit 43a47ea209657fc85fcd7b7d39fec9b2f1cefaa0)

---

diff --git a/bootupd.yaml b/bootupd.yaml
new file mode 100644
index 0000000..68d3696
--- /dev/null
+++ b/bootupd.yaml
@@ -0,0 +1,14 @@
+# KEEP THIS IN SYNC WITH https://github.com/coreos/fedora-coreos-config/blob/testing-devel/manifests/bootupd.yaml
+# Integration with https://github.com/coreos/bootupd
+# xref https://github.com/coreos/fedora-coreos-tracker/issues/510
+packages:
+  - bootupd
+
+postprocess:
+  - |
+    #!/bin/bash
+    set -xeuo pipefail
+    # Until we have https://github.com/coreos/rpm-ostree/pull/2275
+    mkdir -p /run
+    # Transforms /usr/lib/ostree-boot into a bootupd-compatible update payload
+    /usr/bin/bootupctl backend generate-update-metadata /
diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml
index c4c0000..2bf85f4 100644
--- a/fedora-common-ostree.yaml
+++ b/fedora-common-ostree.yaml
@@ -5,6 +5,11 @@ mutate-os-release: "37"
 
 include: fedora-common-ostree-pkgs.yaml
 
+# See https://github.com/coreos/bootupd
+arch-include:
+  x86_64: bootupd.yaml
+  aarch64: bootupd.yaml
+
 packages:
   - git-core
   - lvm2
@@ -50,7 +55,6 @@ check-groups:
 default_target: graphical.target
 
 packages-aarch64:
-  - bootupd
   - grub2-efi
   - ostree-grub2
   - efibootmgr
@@ -65,7 +69,6 @@ packages-ppc64le:
   - grub2
   - ostree-grub2
 packages-x86_64:
-  - bootupd
   - grub2-efi-ia32
   - grub2-efi-x64
   - grub2-pc