From 84a2a2a187dc6e18eb932b44afb1ce05064c64c0 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@fedoraproject.org>
Date: Mon, 8 Apr 2024 22:48:27 -0400
Subject: [PATCH] components/boot: Force grubby at bootstrap phase

If no preference is expressed, sdubby will be selected instead of
grubby, which breaks image builds. Thus, install grubby early to
avoid this issue.
---
 components/boot.xml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/components/boot.xml b/components/boot.xml
index f835e4f..939dad0 100644
--- a/components/boot.xml
+++ b/components/boot.xml
@@ -2,13 +2,15 @@
 	<profiles>
 		<profile name="BootCore" description="Boot core packages"/>
 	</profiles>
+	<packages type="bootstrap" patternType="plusRecommended" profiles="BootCore">
+		<package name="grubby"/>
+	</packages>
 	<packages type="image" patternType="plusRecommended" profiles="BootCore">
 		<package name="grub2-efi-aa64" arch="aarch64"/>
 		<package name="grub2-efi-aa64-modules" arch="aarch64"/>
 		<package name="shim-signed-aa64" arch="aarch64"/>
 		<package name="grub2-efi-aa64" arch="aarch64"/>
 		<package name="uboot-images-armv8" arch="aarch64"/>
-		<package name="grubby"/>
 		<package name="kernel-16k"/>
 		<package name="kernel-16k-modules-extra"/>
 		<package name="systemd-oomd-defaults"/>