From 9b61b0fde918b132af505077ee58f42be2a67de3 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Aug 29 2024 17:13:29 +0000
Subject: [PATCH 1/2] comps-sync-exclude-list: glibc-all-langpacks is always included


There is no need for each variant to include glibc-all-langpacks as it
is included for everyone in the common-packages.yaml manifest.

See: https://pagure.io/fedora-comps/pull-request/1017

---

diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml
index ce676ba..3d1df31 100644
--- a/comps-sync-exclude-list.yml
+++ b/comps-sync-exclude-list.yml
@@ -183,6 +183,11 @@ desktop_exclude_list:
     - initial-setup-gui
     # Already included in all Atomic Desktops by default
     - toolbox
+    # Already included by default for all variants
+    - glibc-all-langpacks
+  kde-mobile:
+    # Already included by default for all variants
+    - glibc-all-langpacks
   xfce-desktop:
     # Incompatible with ostree for various reasons
     - abrt-desktop
diff --git a/kinoite-packages.yaml b/kinoite-packages.yaml
index a53d907..1dd8ea9 100644
--- a/kinoite-packages.yaml
+++ b/kinoite-packages.yaml
@@ -15,7 +15,6 @@ packages:
   - firewall-config
   - flatpak-kcm
   - fprintd-pam
-  - glibc-all-langpacks
   - kaccounts-integration-qt6
   - kcharselect
   - kde-connect

From 417fd0f2e9d086ec6081c850d76e86b244348ef8 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Aug 29 2024 17:13:36 +0000
Subject: [PATCH 2/2] common: Add workaround for issue with newer GRUB2


New GRUB2 config modules are causing issues on Atomic Desktops systems
as the new GRUB2 config get regenerated with new options that are not
supported by the currently installed version of GRUB2.

The root cause is that we don't (yet) systematically update the
bootloader on Atomic Desktops. This is related to:
https://gitlab.com/fedora/ostree/sig/-/issues/1

Temporarily remove / modify those config modules from the GRUB2 set of
configs used to generate the final GRUB2 config, until we are able to
enable bootloader updates by default.

See: https://github.com/fedora-silverblue/issue-tracker/issues/587
See: https://bugzilla.redhat.com/show_bug.cgi?id=2305291

---

diff --git a/common.yaml b/common.yaml
index b16245b..a7f27c2 100644
--- a/common.yaml
+++ b/common.yaml
@@ -15,6 +15,8 @@ include:
   - initramfs.yaml
   # Read only sysroot
   - sysroot-ro.yaml
+  # Workaround for https://github.com/fedora-silverblue/issue-tracker/issues/587
+  - grub2-workaround.yaml
 
 # systemd-pcrphase module fails on ppc64le:
 # https://gitlab.com/fedora/ostree/sig/-/issues/44
diff --git a/grub2-workaround.yaml b/grub2-workaround.yaml
new file mode 100644
index 0000000..3b58a9e
--- /dev/null
+++ b/grub2-workaround.yaml
@@ -0,0 +1,22 @@
+# Temporarily disable new GRUB2 config options until we can ensure that we
+# have an updated bootloader via bootupd.
+# This is workaround for: https://bugzilla.redhat.com/show_bug.cgi?id=2305291
+# See: https://github.com/fedora-silverblue/issue-tracker/issues/587
+postprocess:
+  - |
+    #!/usr/bin/env bash
+    set -xeuo pipefail
+
+    # Completely disable this module
+    sed -i '2i exit 0' /etc/grub.d/25_bli
+
+    # Skip check that was not performed in previous Fedora versions
+    sed -i '/fwsetup --is-supported/d' /etc/grub.d/30_uefi-firmware
+    sed -i '/\tif/d'                   /etc/grub.d/30_uefi-firmware
+    sed -i '/\tfi/d'                   /etc/grub.d/30_uefi-firmware
+    sed -i 's/\t\t/\t/'                /etc/grub.d/30_uefi-firmware
+
+    # Verify that the content matches what we expect the file to look like.
+    # This will fail the build here instead of breaking users' systems.
+    hash="5a77a16c6a94e664e2e96a870f4531b9a0b4e63be1f46751d01e774629a8c84b"
+    echo "$hash  /etc/grub.d/30_uefi-firmware" | sha256sum -c