From 43cc17406124d2e5634fd69f4af2f693def316c1 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Oct 19 2025 12:21:00 +0000 Subject: [PATCH 1/4] manifests: Move Firefox inclusion to Fedora's manifest We want to, eventually, remove Firefox from the base image. Before we can effectively do it, we need to figure out a transition path and make sure that the Firefox Flatpak is mostly functionally equivalent. This change does not remove Firefox from the image but moves it to the Fedora manifest so that downstream builds can exclude it if they want to. See: https://gitlab.com/fedora/ostree/sig/-/issues/3 See: https://github.com/fedora-silverblue/issue-tracker/issues/288 See: https://gitlab.com/fedora/sigs/flatpak/fedora-flatpaks/-/issues/13 --- diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index 7b4a115..6748314 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -106,6 +106,7 @@ exclude_list: firefox: # Included explicitly in the fedora.yaml manifest - fedora-bookmarks + - firefox networkmanager-submodules: # Let's use the builtin one by default - dhcp-client @@ -169,6 +170,7 @@ desktop_exclude_list: # Included explicitly in the fedora.yaml manifest - fedora-flathub-remote - fedora-workstation-repositories + - firefox budgie-desktop-apps: # Non-critical apps -> Flatpak - atril @@ -176,6 +178,8 @@ desktop_exclude_list: - gnome-calculator - parole - rhythmbox + # Included explicitly in the fedora.yaml manifest + - firefox kde-desktop: # Incompatible with ostree for various reasons - abrt-desktop diff --git a/fedora.yaml b/fedora.yaml index 7ae21e7..18e5add 100644 --- a/fedora.yaml +++ b/fedora.yaml @@ -10,6 +10,9 @@ packages: - fedora-flathub-remote - fedora-workstation-backgrounds - fedora-workstation-repositories + # 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 # Fedora specific packages for each variant conditional-include: diff --git a/packages/budgie-atomic.yaml b/packages/budgie-atomic.yaml index 5bfcd38..a943c62 100644 --- a/packages/budgie-atomic.yaml +++ b/packages/budgie-atomic.yaml @@ -15,7 +15,6 @@ packages: - budgie-desktop-view - budgie-screensaver - dconf - - firefox - fprintd-pam - gedit - glib-networking diff --git a/packages/common.yaml b/packages/common.yaml index a00611e..0cf1e2b 100644 --- a/packages/common.yaml +++ b/packages/common.yaml @@ -56,7 +56,6 @@ packages: - exfatprogs - file - filesystem - - firefox - firewalld - fpaste - fwupd diff --git a/sway-atomic-common.yaml b/sway-atomic-common.yaml index e74a882..35284ec 100644 --- a/sway-atomic-common.yaml +++ b/sway-atomic-common.yaml @@ -11,10 +11,6 @@ include: - common.yaml - packages/sway-atomic.yaml -packages: - # explicitly list some defaults - - firefox - exclude-packages: # nothing in the tree would use these - tracker From 88fc015893ba0a059eba04746c1a715bde709de4 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Oct 19 2025 12:21:06 +0000 Subject: [PATCH 2/4] common: Remove plocate Remove `plocate` as this is a command line tool and it comes with a service that periodically scans the entire filesystem. As we use containers and Flatpaks, this list of files is not really useful nor accurate and changes frequently. We expect users to use graphical tools instead to help them find their files if needed. See: https://gitlab.com/fedora/ostree/sig/-/issues/81 --- diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index 6748314..3e69301 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -103,6 +103,8 @@ exclude_list: - fedora-flathub-remote - fedora-workstation-backgrounds - fedora-workstation-repositories + # See: https://gitlab.com/fedora/ostree/sig/-/issues/81 + - plocate firefox: # Included explicitly in the fedora.yaml manifest - fedora-bookmarks diff --git a/packages/common.yaml b/packages/common.yaml index 0cf1e2b..43ef6c8 100644 --- a/packages/common.yaml +++ b/packages/common.yaml @@ -128,7 +128,6 @@ packages: - pipewire-gstreamer - pipewire-pulseaudio - pipewire-utils - - plocate - plymouth - plymouth-system-theme - policycoreutils From 036e89cf223a29e54ff44eaf91b693bf04b2eb08 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Oct 19 2025 12:21:06 +0000 Subject: [PATCH 3/4] common: Add wireguard-tools for all variants While we expect users to use the support in NetworkManager and corresponding graphical interfaces to setup WireGuard connections, it is practical to have the command line tool at hand to validate settings and debug issues. Users have also been requesting the additional functionnality provided by the associated tools and services from the package. Finally, it is a really small package. See: https://github.com/fedora-silverblue/issue-tracker/issues/390 See: https://pagure.io/fedora-workstation/issue/353 See: https://pagure.io/fedora-kde/SIG/issue/381 --- diff --git a/common.yaml b/common.yaml index cfa23fb..a745523 100644 --- a/common.yaml +++ b/common.yaml @@ -108,6 +108,8 @@ packages: - printer-driver-brlaser - ptouch-driver - splix + # See: https://github.com/fedora-silverblue/issue-tracker/issues/390 + - wireguard-tools selinux: true documentation: true From 10feb733f54b5b6d352fb1c5174a3641d8ad71d6 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Oct 19 2025 12:21:06 +0000 Subject: [PATCH 4/4] silverblue: Add openssl While it is not strictly needed for the default installation, it is a dependency of a frequently installed GNOME Shell extension: GSConnect. Let's include it as layering is not a great option, containers won't work here and sysexts are not ready for this yet. See: https://pagure.io/fedora-workstation/issue/426 See: https://github.com/fedora-silverblue/issue-tracker/issues/201 See: https://github.com/GSConnect/gnome-shell-extension-gsconnect/wiki/Help#openssl-not-found --- diff --git a/silverblue-common.yaml b/silverblue-common.yaml index 07b2a3c..155a6f3 100644 --- a/silverblue-common.yaml +++ b/silverblue-common.yaml @@ -30,6 +30,9 @@ packages: - totem-video-thumbnailer # Make sure that GNOME Software's rpm-ostree plugin is always installed - gnome-software-rpm-ostree + # Needed for GSConnect extension + # See: https://github.com/fedora-silverblue/issue-tracker/issues/201 + - openssl # Skip Third Party Software page in GNOME Initial Setup as it currently does # not work. See: https://bugzilla.redhat.com/show_bug.cgi?id=2362164