From 72fc203a824087a2382b684a65a6ef8fef27ec02 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa13@gmail.com>
Date: Fri, 2 Jul 2021 19:43:40 -0400
Subject: [PATCH] Create "cloud-bootloader-tools" group for cloud server
 environment

This group contains the package set for the needed bootloader packages
across different architectures to simplify handling so that Cloud images
always have the needed bootloaders when building for a given architecture.

Reference: https://fedoraproject.org/wiki/Changes/FedoraCloudHybridBoot

Signed-off-by: Neal Gompa <ngompa13@gmail.com>
---
 comps-f35.xml.in | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/comps-f35.xml.in b/comps-f35.xml.in
index 24a7a1fb..945d917e 100644
--- a/comps-f35.xml.in
+++ b/comps-f35.xml.in
@@ -472,6 +472,31 @@
       <packagereq type="mandatory">xreader</packagereq>
     </packagelist>
   </group>
+  <group>
+    <id>cloud-bootloader-tools</id>
+    <_name>Bootloader tools for Cloud images</_name>
+    <_description>Bootloader software for images that run in "cloud" environments</_description>
+    <default>false</default>
+    <uservisible>false</uservisible>
+    <packagelist>
+      <packagereq arch="aarch64,armhfp,x86_64" type="mandatory">efibootmgr</packagereq>
+      <packagereq arch="aarch64" type="mandatory">grub2-efi-aa64</packagereq>
+      <packagereq arch="armhfp" type="mandatory">grub2-efi-arm</packagereq>
+      <packagereq arch="x86_64" type="mandatory">grub2-efi-ia32</packagereq>
+      <packagereq arch="x86_64" type="mandatory">grub2-efi-x64</packagereq>
+      <packagereq arch="x86_64" type="mandatory">grub2-pc</packagereq>
+      <packagereq arch="ppc64" type="mandatory">grub2-ppc64</packagereq>
+      <packagereq arch="ppc64le" type="mandatory">grub2-ppc64le</packagereq>
+      <packagereq arch="aarch64,armhfp,ppc64,ppc64le,x86_64" type="mandatory">grub2-tools</packagereq>
+      <packagereq arch="x86_64" type="mandatory">grub2-tools-efi</packagereq>
+      <packagereq arch="aarch64,armhfp,ppc64,ppc64le,x86_64" type="mandatory">grub2-tools-extra</packagereq>
+      <packagereq arch="s390x" type="mandatory">s390utils</packagereq>
+      <packagereq arch="s390x" type="mandatory">s390utils-base</packagereq>
+      <packagereq arch="aarch64" type="mandatory">shim-aa64</packagereq>
+      <packagereq arch="x86_64" type="mandatory">shim-ia32</packagereq>
+      <packagereq arch="x86_64" type="mandatory">shim-x64</packagereq>
+    </packagelist>
+  </group>
   <group>
     <id>cloud-infrastructure</id>
     <_name>Cloud Infrastructure</_name>
@@ -6208,6 +6233,7 @@
     <_description>A server install with components needed to run in a cloud environment.</_description>
     <display_order>3</display_order>
     <grouplist>
+      <groupid>cloud-bootloader-tools</groupid>
       <groupid>cloud-server</groupid>
       <groupid>core</groupid>
     </grouplist>