From 338ba166264a9f9c6e235d90fd3b3f59c7e72fd8 Mon Sep 17 00:00:00 2001
From: dftxbs3e <dftxbs3e@free.fr>
Date: May 07 2019 18:39:27 +0000
Subject: Blacklist x86_64 specific packages and make them arch specific


Signed-off-by: dftxbs3e <dftxbs3e@free.fr>

---

diff --git a/comps-sync-blacklist.yml b/comps-sync-blacklist.yml
index 568d051..bd2ac96 100644
--- a/comps-sync-blacklist.yml
+++ b/comps-sync-blacklist.yml
@@ -37,6 +37,16 @@ blacklist:
     # Needs to be arch specific
     - powerpc-utils
     - lsvpd
+    # Blacklist x86_64 specific packages, they will be added back by fedora-common-ostree.yaml
+    - hyperv-daemons
+    - mcelog
+    - microcode_ctl
+    - open-vm-tools-desktop
+    - virtualbox-guest-additions
+    - xorg-x11-drv-intel
+    - xorg-x11-drv-openchrome
+    - xorg-x11-drv-vesa
+    - xorg-x11-drv-vmware
   base-x:
     # These are for arm...need to handle arch-specific bits
     - xorg-x11-drv-armsoc
diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml
index 6b66bcb..109db82 100644
--- a/fedora-common-ostree-pkgs.yaml
+++ b/fedora-common-ostree-pkgs.yaml
@@ -75,7 +75,6 @@ packages:
   - hostname
   - hplip
   - hunspell
-  - hyperv-daemons
   - ibus-gtk2
   - ibus-gtk3
   - ibus-hangul
@@ -133,11 +132,9 @@ packages:
   - lsof
   - man-db
   - man-pages
-  - mcelog
   - mdadm
   - mesa-dri-drivers
   - mesa-vulkan-drivers
-  - microcode_ctl
   - mlocate
   - mpage
   - mtr
@@ -145,7 +142,6 @@ packages:
   - nss-altfiles
   - nss-mdns
   - ntfsprogs
-  - open-vm-tools-desktop
   - openssh-clients
   - openssh-server
   - paktype-naskh-basic-fonts
@@ -210,7 +206,6 @@ packages:
   - util-linux
   - vconfig
   - vim-minimal
-  - virtualbox-guest-additions
   - wget
   - which
   - wireless-tools
@@ -218,13 +213,9 @@ packages:
   - xorg-x11-drv-ati
   - xorg-x11-drv-evdev
   - xorg-x11-drv-fbdev
-  - xorg-x11-drv-intel
   - xorg-x11-drv-libinput
   - xorg-x11-drv-nouveau
-  - xorg-x11-drv-openchrome
   - xorg-x11-drv-qxl
-  - xorg-x11-drv-vesa
-  - xorg-x11-drv-vmware
   - xorg-x11-drv-wacom
   - xorg-x11-server-Xorg
   - xorg-x11-utils
diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml
index fc44f4e..e6936f2 100644
--- a/fedora-common-ostree.yaml
+++ b/fedora-common-ostree.yaml
@@ -70,3 +70,11 @@ packages-x86_64:
   - efibootmgr
   - shim
   - microcode_ctl
+  - mcelog
+  - 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