From 898bf23a672672e599c0e6260252a184145c0515 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= <tim@siosm.fr>
Date: Wed, 22 Nov 2023 17:18:08 +0100
Subject: [PATCH] manifests: Explicitly include amd-ucode-firmware

Explicitly include this sub package as we want to make sure that AMD CPU
microcode firmwares are included in FCOS, just like we include the ones
for Intel CPU.

See: https://bugzilla.redhat.com/show_bug.cgi?id=2251053
Fixes: https://github.com/coreos/fedora-coreos-tracker/issues/1618
---
 manifest-lock.x86_64.json          | 3 +++
 manifests/bootable-rpm-ostree.yaml | 1 +
 2 files changed, 4 insertions(+)

diff --git a/manifest-lock.x86_64.json b/manifest-lock.x86_64.json
index c9ca8e219d..30183ed10b 100644
--- a/manifest-lock.x86_64.json
+++ b/manifest-lock.x86_64.json
@@ -39,6 +39,9 @@
     "amd-gpu-firmware": {
       "evra": "20231111-1.fc39.noarch"
     },
+    "amd-ucode-firmware": {
+      "evra": "20231111-1.fc39.noarch"
+    },
     "atheros-firmware": {
       "evra": "20231111-1.fc39.noarch"
     },
diff --git a/manifests/bootable-rpm-ostree.yaml b/manifests/bootable-rpm-ostree.yaml
index 9d5faddbec..1cdd3810be 100644
--- a/manifests/bootable-rpm-ostree.yaml
+++ b/manifests/bootable-rpm-ostree.yaml
@@ -29,6 +29,7 @@ packages-s390x:
 packages-x86_64:
   - grub2 grub2-efi-x64 efibootmgr shim
   - microcode_ctl
+  - amd-ucode-firmware
 
 exclude-packages:
   # Exclude kernel-debug-core to make sure that it doesn't somehow get