From 4c2694e1d8b349e6f2c00f8c1fc27102e9471435 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Wed, 28 Nov 2018 17:16:52 -0800
Subject: [PATCH] Move grubby and grubby-deprecated from @core to @arm-tools

Adding them into @core was supposed to make them show up in some
install trees, according to the commit message, but it broke
regular BLS installs:

https://bugzilla.redhat.com/show_bug.cgi?id=1654036

which is obviously a major problem. I *think* moving the entries
to arm-tools should ensure the packages are in the relevant trees
without breaking BLS installs.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
 comps-f30.xml.in | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/comps-f30.xml.in b/comps-f30.xml.in
index 333ad2a9..fcef1294 100644
--- a/comps-f30.xml.in
+++ b/comps-f30.xml.in
@@ -157,6 +157,8 @@
     <packagelist>
       <packagereq>arm-image-installer</packagereq>
       <packagereq>cloud-utils-growpart</packagereq>
+      <packagereq>grubby</packagereq>
+      <packagereq>grubby-deprecated</packagereq>
       <packagereq>uboot-images-armv7</packagereq>
       <packagereq>uboot-images-armv8</packagereq>
       <packagereq>zram</packagereq>
@@ -753,8 +755,6 @@
       <packagereq type="default">dnf-plugins-core</packagereq>
       <packagereq type="default">dracut-config-rescue</packagereq>
       <packagereq type="default">firewalld</packagereq>
-      <packagereq type="default">grubby</packagereq>
-      <packagereq type="default">grubby-deprecated</packagereq>
       <packagereq type="default">lsvpd</packagereq>
       <packagereq type="default">NetworkManager</packagereq>
       <packagereq type="default">powerpc-utils</packagereq>