From 9b781f714710f0fd97df61a8287c651436ecb9d8 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Dec 04 2024 16:45:49 +0000
Subject: [PATCH 1/4] common: Exclude Tk by default


Make sure that we do not pull Tk in the image by default. We can not
exclude Tcl as well as it is currently needed by `usb_modeswitch`.

---

diff --git a/common.yaml b/common.yaml
index dee78d0..85c4a50 100644
--- a/common.yaml
+++ b/common.yaml
@@ -132,6 +132,8 @@ exclude-packages:
   # https://github.com/fedora-silverblue/issue-tracker/issues/517
   - grubby
   - sdubby
+  # Exclude Tk. We can not exclude Tcl as it is neeeded for usb_modeswitch
+  - tk
 
 postprocess:
   - |

From da06dff4a79f7b0f03fff8049fb29fcc7ae4e618 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Dec 04 2024 17:16:52 +0000
Subject: [PATCH 2/4] ci: Remove dnf5 workaround


See: https://pagure.io/fedora-ci/general/issue/474

---

diff --git a/ci/validate.yaml b/ci/validate.yaml
index eaa665f..be7ae1b 100644
--- a/ci/validate.yaml
+++ b/ci/validate.yaml
@@ -1,9 +1,5 @@
 - hosts: all
   tasks:
-    - name: Install system dependencies
-      shell: dnf install -y python3-libdnf5
-      become: true
-
     - name: Upgrade all packages
       ansible.builtin.dnf:
         name: "*"

From 67cf7e6477d14c58a2cc3993b2951be9e4431ab5 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Dec 04 2024 17:16:52 +0000
Subject: [PATCH 3/4] common: Exclude QEMU


See: https://gitlab.com/fedora/ostree/sig/-/issues/58

---

diff --git a/common.yaml b/common.yaml
index 85c4a50..7b7fcb5 100644
--- a/common.yaml
+++ b/common.yaml
@@ -134,6 +134,11 @@ exclude-packages:
   - sdubby
   # Exclude Tk. We can not exclude Tcl as it is neeeded for usb_modeswitch
   - tk
+  # Exclude QEMU. See: https://gitlab.com/fedora/ostree/sig/-/issues/58
+  - qemu-kvm
+  - qemu-kvm-core
+  - qemu-device-display-virtio-gpu
+  - qemu-device-display-virtio-vga
 
 postprocess:
   - |

From 85612adca1a5f74f1963fcbf403ceafc784c20eb Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Dec 04 2024 17:16:52 +0000
Subject: [PATCH 4/4] common: Exclude less common architectures for QEMU user static


Keep only x86-64 qemu-user-static package on aarch64 & ppc64le

This is pulled in by the containers-common package in order to be able
to run containers from a different architecture.

See: https://gitlab.com/fedora/ostree/sig/-/issues/59

---

diff --git a/common.yaml b/common.yaml
index 7b7fcb5..617e26a 100644
--- a/common.yaml
+++ b/common.yaml
@@ -21,8 +21,13 @@ include:
 arch-include:
   x86_64:
     - initramfs-tpm-luks.yaml
+    - qemu-user-static-x86_64.yaml
   aarch64:
     - initramfs-tpm-luks.yaml
+    - qemu-user-static-non-x86_64.yaml
+  ppc64le:
+    - qemu-user-static-non-x86_64.yaml
+
 
 conditional-include:
   # Manifests included only for classic ostree variants
diff --git a/qemu-user-static-non-x86_64.yaml b/qemu-user-static-non-x86_64.yaml
new file mode 100644
index 0000000..7edfafa
--- /dev/null
+++ b/qemu-user-static-non-x86_64.yaml
@@ -0,0 +1,22 @@
+# Keep only x86_64 emulation for aarch64 & ppc64le
+# See: https://gitlab.com/fedora/ostree/sig/-/issues/59
+packages:
+  - qemu-user-static-x86
+exclude-packages:
+  - qemu-user-static-aarch64
+  - qemu-user-static-alpha
+  - qemu-user-static-arm
+  - qemu-user-static-cris
+  - qemu-user-static-hexagon
+  - qemu-user-static-hppa
+  - qemu-user-static-loongarch64
+  - qemu-user-static-m68k
+  - qemu-user-static-microblaze
+  - qemu-user-static-mips
+  - qemu-user-static-or1k
+  - qemu-user-static-ppc
+  - qemu-user-static-riscv
+  - qemu-user-static-s390x
+  - qemu-user-static-sh4
+  - qemu-user-static-sparc
+  - qemu-user-static-xtensa
diff --git a/qemu-user-static-x86_64.yaml b/qemu-user-static-x86_64.yaml
new file mode 100644
index 0000000..c01eb05
--- /dev/null
+++ b/qemu-user-static-x86_64.yaml
@@ -0,0 +1,22 @@
+# Keep only aarch64 emulation for x86_64
+# See: https://gitlab.com/fedora/ostree/sig/-/issues/59
+packages:
+  - qemu-user-static-aarch64
+exclude-packages:
+  - qemu-user-static-alpha
+  - qemu-user-static-arm
+  - qemu-user-static-cris
+  - qemu-user-static-hexagon
+  - qemu-user-static-hppa
+  - qemu-user-static-loongarch64
+  - qemu-user-static-m68k
+  - qemu-user-static-microblaze
+  - qemu-user-static-mips
+  - qemu-user-static-or1k
+  - qemu-user-static-ppc
+  - qemu-user-static-riscv
+  - qemu-user-static-s390x
+  - qemu-user-static-sh4
+  - qemu-user-static-sparc
+  - qemu-user-static-x86
+  - qemu-user-static-xtensa