From 6a689cc38098cd5fb5eecdaa31974f887d4590ef Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Nov 09 2022 19:10:17 +0000
Subject: Drop some now-unneeded manual handling of arch-specific packages


This lets the recently-merged improved arch-specific package
support handle all the arch-specific packages which were
previously excluded in `comps-sync-exclude-list.yml` and listed
manually in `fedora-common-ostree.yaml`. As the diff shows,
the sync script now correctly includes the same packages for
the same arches in `fedora-common-ostree-pkgs.yaml`, plus a few
appropriate additions of things that should be there but had
been left out, on ppc64le and aarch64.

We also drop the `packages-armhfp` and `packages-ppc64` lists,
as we no longer build for either of those arches. This allows
us to move `ostree-grub2` into the non-arch-specific list, since
it's no longer left out on any arch we care about.

Signed-off-by: Adam Williamson <awilliam@redhat.com>

---

diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml
index f2e053b..75e881f 100644
--- a/comps-sync-exclude-list.yml
+++ b/comps-sync-exclude-list.yml
@@ -38,25 +38,6 @@ exclude_list:
     - grubby-deprecated
     # Why?
     - ncurses
-    # Architecture specific packages
-    - powerpc-utils
-    - lsvpd
-    - s390utils-base
-  base-x:
-    # x86 specific packages. Added back by fedora-common-ostree.yaml
-    - xorg-x11-drv-intel
-    - xorg-x11-drv-openchrome
-    - xorg-x11-drv-vesa
-    - xorg-x11-drv-vmware
-    # ARM specific packages
-    - xorg-x11-drv-armada
-    - xorg-x11-drv-armsoc
-    - xorg-x11-drv-omap
-  guest-desktop-agents:
-    # x86 specific packages. Added back by fedora-common-ostree.yaml
-    - hyperv-daemons
-    - open-vm-tools-desktop
-    - virtualbox-guest-additions
   workstation-product:
     # We use rpm-ostree for the host
     - dnf
@@ -116,10 +97,6 @@ exclude_list:
     - gnome-shell-extension-background-logo
     - pinentry-gnome3
     - qgnomeplatform
-    # x86 specific packages. Added back by fedora-common-ostree.yaml
-    - mcelog
-    - microcode_ctl
-    - thermald
   networkmanager-submodules:
     # Let's use the builtin one by default
     - dhcp-client
diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml
index 1ef3fbf..cf9a3fc 100644
--- a/fedora-common-ostree-pkgs.yaml
+++ b/fedora-common-ostree-pkgs.yaml
@@ -237,3 +237,20 @@ packages:
   - zram-generator-defaults
 packages-x86_64:
   - alsa-sof-firmware
+  - hyperv-daemons
+  - mcelog
+  - microcode_ctl
+  - open-vm-tools-desktop
+  - thermald
+  - virtualbox-guest-additions
+  - xorg-x11-drv-intel
+  - xorg-x11-drv-openchrome
+  - xorg-x11-drv-vesa
+  - xorg-x11-drv-vmware
+packages-aarch64:
+  - hyperv-daemons
+  - open-vm-tools-desktop
+  - xorg-x11-drv-armsoc
+packages-ppc64le:
+  - lsvpd
+  - powerpc-utils
diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml
index 3445277..7414085 100644
--- a/fedora-common-ostree.yaml
+++ b/fedora-common-ostree.yaml
@@ -16,6 +16,7 @@ packages:
   - git-core
   - lvm2
   - rpm-ostree
+  - ostree-grub2
   # Container management
   - buildah
   - podman
@@ -58,36 +59,17 @@ default_target: graphical.target
 
 packages-aarch64:
   - grub2-efi
-  - ostree-grub2
   - efibootmgr
   - shim
-packages-armhfp:
-  - extlinux-bootloader
-  - xorg-x11-drv-armada
-packages-ppc64:
-  - grub2
-  - ostree-grub2
 packages-ppc64le:
   - grub2
-  - ostree-grub2
 packages-x86_64:
   - grub2-efi-ia32
   - grub2-efi-x64
   - grub2-pc
-  - ostree-grub2
   - efibootmgr
   - shim-ia32
   - shim-x64
-  - microcode_ctl
-  - mcelog
-  - thermald
-  - hyperv-daemons
-  - open-vm-tools-desktop
-  - virtualbox-guest-additions
-  - xorg-x11-drv-intel
-  - xorg-x11-drv-openchrome
-  - xorg-x11-drv-vesa
-  - xorg-x11-drv-vmware
 
 # Make sure the following are not pulled in when Recommended by other packages
 exclude-packages: