From 98d82ef030f02938efeccff06dea3d6e7fdecf6c Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Nov 12 2024 10:47:09 +0000
Subject: [PATCH 1/4] common: Keep fuse-overlayfs for compatibility and rootless


podman now defaults to native overlayfs for the storage driver and
removed the dependency on fuse-overlayfs in containers-common.

We had manually kept it in Fedora 40 as it was released with
fuse-overlayfs so we had to keep it for compatibility during the major
release lifetime.

From discussions, it appears that this driver is still useful in
rootless container use cases and has better performance there, thus
let's keep it in the Atomic Desktops for now as this is a common use
case.

See: https://src.fedoraproject.org/rpms/containers-common/c/447945e59a01cb6715ed2a21877d45bf0b91ef67
See: https://github.com/coreos/fedora-coreos-tracker/issues/1749

---

diff --git a/common.yaml b/common.yaml
index cf940f3..6710c02 100644
--- a/common.yaml
+++ b/common.yaml
@@ -60,6 +60,9 @@ packages:
   # Keep slirp4netns for rootless containers until it's fully deprecated in podman
   # See: https://github.com/fedora-silverblue/issue-tracker/issues/547
   - slirp4netns
+  # Keep fuse-overlayfs for compatibilty and rootless containers use cases
+  # See: https://github.com/coreos/fedora-coreos-tracker/issues/1749
+  - fuse-overlayfs
   # See: https://github.com/fedora-silverblue/issue-tracker/issues/503
   - systemd-container
   # Provides terminal tools like clear, reset, tput, and tset

From bb9c49581a5995142d5d760c50f6796fb509f79c Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Nov 29 2024 16:00:27 +0000
Subject: [PATCH 2/4] bootupd: Enable updates for BIOS as well


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

---

diff --git a/bootupd.yaml b/bootupd.yaml
index 9e6b6fa..5fbb0fc 100644
--- a/bootupd.yaml
+++ b/bootupd.yaml
@@ -17,7 +17,6 @@ postprocess:
     [Unit]
     Description=Update bootloader on boot
     Documentation=https://github.com/coreos/bootupd
-    ConditionFirmware=uefi
 
     [Service]
     Type=oneshot

From 145083dfaf148686931088ae2076b8e53141df81 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Nov 29 2024 16:00:27 +0000
Subject: [PATCH 3/4] Revert "common: Add workaround for issue with newer GRUB2"


Should be safe to revert now that a fix has been pushed to GRUB2.

See: https://bugzilla.redhat.com/show_bug.cgi?id=2305291
See: https://bodhi.fedoraproject.org/updates/FEDORA-2024-2e76a9ff56

This reverts commit 13527685ce65e81dab197cc009fbe4944fc61486.

---

diff --git a/common.yaml b/common.yaml
index 6710c02..dee78d0 100644
--- a/common.yaml
+++ b/common.yaml
@@ -15,8 +15,6 @@ 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
deleted file mode 100644
index 3b58a9e..0000000
--- a/grub2-workaround.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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

From 296d0e94406b559ac2054f79da141ffe66f4dab7 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Dec 02 2024 11:44:24 +0000
Subject: [PATCH 4/4] comps-sync f42 2024-12-02


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

---

diff --git a/kinoite-mobile-packages.yaml b/kinoite-mobile-packages.yaml
index d66a6bf..c3ce83d 100644
--- a/kinoite-mobile-packages.yaml
+++ b/kinoite-mobile-packages.yaml
@@ -1,5 +1,6 @@
 # DO NOT EDIT! This content is generated from comps-sync.py
 packages:
+  - bluedevil
   - elisa-player
   - haruna
   - kalk