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
This commit is contained in:
Timothée Ravier 2025-10-19 13:21:58 +02:00
parent 7a64fa989e
commit 43cc174061
5 changed files with 7 additions and 6 deletions

View file

@ -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

View file

@ -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:

View file

@ -15,7 +15,6 @@ packages:
- budgie-desktop-view
- budgie-screensaver
- dconf
- firefox
- fprintd-pam
- gedit
- glib-networking

View file

@ -56,7 +56,6 @@ packages:
- exfatprogs
- file
- filesystem
- firefox
- firewalld
- fpaste
- fwupd

View file

@ -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