From baaab74d38f5e0f7d97eb1d545c537fb9cb9e743 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Nov 27 2025 22:25:01 +0000 Subject: [PATCH 1/6] manifest: Move FUSE v2 support to Fedora's manifest Move support for FUSE version 2 to Fedora's manifest to be able to exclude it from downstream builds. We should be able to drop support for FUSE v2 in F44. See: https://gitlab.com/fedora/ostree/sig/-/issues/50 --- diff --git a/common.yaml b/common.yaml index bc59478..3b3026f 100644 --- a/common.yaml +++ b/common.yaml @@ -90,10 +90,6 @@ packages: # Always include at least full English language support by default # https://gitlab.com/fedora/ostree/sig/-/issues/14 - langpacks-en - # Kept for backward compatibility for AppImages - # See: https://gitlab.com/fedora/ostree/sig/-/issues/50 - - fuse - - fuse-libs # Selected packages from the anaconda-tools group. See: https://gitlab.com/fedora/ostree/sig/-/issues/5 - dosfstools - lvm2 diff --git a/fedora.yaml b/fedora.yaml index 18e5add..082e6c7 100644 --- a/fedora.yaml +++ b/fedora.yaml @@ -13,6 +13,10 @@ packages: # Must be included in the image until we figure out how to transistion users # to the Flatpak'ed one. See: https://gitlab.com/fedora/ostree/sig/-/issues/3 - firefox + # Kept for backward compatibility for AppImages + # See: https://gitlab.com/fedora/ostree/sig/-/issues/50 + - fuse + - fuse-libs # Fedora specific packages for each variant conditional-include: From 2f26a61e796ecf45e8da685d7080978bb2d3a6c1 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Nov 27 2025 22:25:01 +0000 Subject: [PATCH 2/6] comps-sync-exclude-list: Exclude git-core We have git-core explicitly added in the common manifest. --- diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index 3e69301..6d39eac 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -214,6 +214,8 @@ desktop_exclude_list: swaywm-extended: # Non-critical apps -> Flatpak - mpv + # Explicitly added in common.yaml + - git-core cosmic-desktop-apps: # Non-critical apps -> Flatpak - gnome-calculator diff --git a/packages/sway-atomic.yaml b/packages/sway-atomic.yaml index 8e132a4..41e4ddb 100644 --- a/packages/sway-atomic.yaml +++ b/packages/sway-atomic.yaml @@ -12,7 +12,6 @@ packages: - dunst - foot - fprintd-pam - - git-core - gnome-keyring-pam - gnome-themes-extra - grim From 1cc82b4158308b8abc88fac078d6dc043e0cc0b6 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Nov 27 2025 22:25:01 +0000 Subject: [PATCH 3/6] fedora: Move toolbox to the Fedora specific manifest Some downstream want to use alternative implementations instead of toolbox. Move it to the Fedora specific manifest to make that easier. --- diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index 6d39eac..f0b957a 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -105,6 +105,8 @@ exclude_list: - fedora-workstation-repositories # See: https://gitlab.com/fedora/ostree/sig/-/issues/81 - plocate + # Included explicitly in the fedora.yaml manifest + - toolbox firefox: # Included explicitly in the fedora.yaml manifest - fedora-bookmarks @@ -216,6 +218,9 @@ desktop_exclude_list: - mpv # Explicitly added in common.yaml - git-core + cosmic-desktop: + # Included explicitly in the fedora.yaml manifest + - toolbox cosmic-desktop-apps: # Non-critical apps -> Flatpak - gnome-calculator diff --git a/fedora.yaml b/fedora.yaml index 082e6c7..1d4a1c9 100644 --- a/fedora.yaml +++ b/fedora.yaml @@ -17,6 +17,8 @@ packages: # See: https://gitlab.com/fedora/ostree/sig/-/issues/50 - fuse - fuse-libs + # Allow downstreams to use an alternative + - toolbox # Fedora specific packages for each variant conditional-include: diff --git a/packages/common.yaml b/packages/common.yaml index e4feb04..d2c075f 100644 --- a/packages/common.yaml +++ b/packages/common.yaml @@ -168,7 +168,6 @@ packages: - tar - time - tiwilink-firmware - - toolbox - tree - unzip - uresourced diff --git a/packages/cosmic-atomic.yaml b/packages/cosmic-atomic.yaml index f004e19..a60b1a7 100644 --- a/packages/cosmic-atomic.yaml +++ b/packages/cosmic-atomic.yaml @@ -15,4 +15,3 @@ packages: - mesa-dri-drivers - mesa-vulkan-drivers - plymouth-system-theme - - toolbox From ca271955b1d1d4a58b7249f527fb7c6e00f70790 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Nov 27 2025 22:25:01 +0000 Subject: [PATCH 4/6] common: Workaround for dynamic UID/GID issue See: https://gitlab.com/fedora/ostree/sig/-/issues/90 --- diff --git a/common.yaml b/common.yaml index 3b3026f..6b17135 100644 --- a/common.yaml +++ b/common.yaml @@ -34,6 +34,8 @@ include: - kernel-install.yaml # Enable composefs - composefs.yaml + # Selected ownership fixes for files in /etc & /var owned by a dynamic UID/GID + - dynamic-ugid-ownership-fixes.yaml arch-include: x86_64: diff --git a/dynamic-ugid-ownership-fixes.yaml b/dynamic-ugid-ownership-fixes.yaml new file mode 100644 index 0000000..cfd9343 --- /dev/null +++ b/dynamic-ugid-ownership-fixes.yaml @@ -0,0 +1,13 @@ +# Selected ownership fixes for files in /etc & /var owned by a dynamic UID/GID +# See: https://gitlab.com/fedora/ostree/sig/-/issues/90 + +postprocess: + - | + #!/bin/bash + set -xeuo pipefail + + cat > /usr/lib/tmpfiles.d/90-atomic-desktops-ownership-fixes.conf << 'EOF' + Z /var/lib/passim - passim passim + Z /var/log/passim - passim passim + Z /etc/colord/ - colord colord + EOF From e3c32ef75686b611202da919d3c7265d3b28b492 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Nov 27 2025 22:25:01 +0000 Subject: [PATCH 5/6] dynamic-ugid: Add workaround for gnome-remote-desktop Fixes: https://github.com/fedora-silverblue/issue-tracker/issues/679 See: https://gitlab.com/fedora/ostree/sig/-/issues/90 --- diff --git a/dynamic-ugid-ownership-fixes.yaml b/dynamic-ugid-ownership-fixes.yaml index cfd9343..03b06b4 100644 --- a/dynamic-ugid-ownership-fixes.yaml +++ b/dynamic-ugid-ownership-fixes.yaml @@ -10,4 +10,6 @@ postprocess: Z /var/lib/passim - passim passim Z /var/log/passim - passim passim Z /etc/colord/ - colord colord + Z /var/lib/gnome-remote-desktop/ - gnome-remote-desktop gnome-remote-desktop + Z /etc/gnome-remote-desktop/ - gnome-remote-desktop gnome-remote-desktop EOF From 442345f877a9b4ad5058251443e854ec6ec06288 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Dec 16 2025 15:48:54 +0000 Subject: [PATCH 6/6] comps-sync f43 2025-12-16 See: https://pagure.io/fedora-comps/pull-request/1211 --- diff --git a/packages/cosmic-atomic.yaml b/packages/cosmic-atomic.yaml index a60b1a7..d4ae517 100644 --- a/packages/cosmic-atomic.yaml +++ b/packages/cosmic-atomic.yaml @@ -15,3 +15,4 @@ packages: - mesa-dri-drivers - mesa-vulkan-drivers - plymouth-system-theme + - system-config-printer