From 6cda332fc814ba8caccc44ab173ffe7539ec851a Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Sep 17 2020 23:14:52 +0000
Subject: thermald is x86_64 only


As with mcelog and microcode_ctl, add it to the blocklist and
list it manually in packages-x86_64 in fedora-common-ostree.yaml
instead. This should fix non-x86_64 arches which are failing
because they can't find it.

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

---

diff --git a/comps-sync-blacklist.yml b/comps-sync-blacklist.yml
index dc02aaa..0ff3848 100644
--- a/comps-sync-blacklist.yml
+++ b/comps-sync-blacklist.yml
@@ -113,6 +113,7 @@ blacklist:
     # 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 e9e6671..f4e784d 100644
--- a/fedora-common-ostree-pkgs.yaml
+++ b/fedora-common-ostree-pkgs.yaml
@@ -197,7 +197,6 @@ packages:
   - systemd-udev
   - tar
   - thai-scalable-waree-fonts
-  - thermald
   - time
   - tree
   - unzip
diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml
index d647e9a..d41261a 100644
--- a/fedora-common-ostree.yaml
+++ b/fedora-common-ostree.yaml
@@ -73,6 +73,7 @@ packages-x86_64:
   - shim
   - microcode_ctl
   - mcelog
+  - thermald
   - hyperv-daemons
   - open-vm-tools-desktop
   - virtualbox-guest-additions