From 7e4742b576151deabff0a03abd993577bc83ca75 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Sep 22 2025 09:11:13 +0000 Subject: [PATCH 1/3] silverblue: Skip Third Party Software page in GNOME Initial Setup Skip Third Party Software page in GNOME Initial Setup as it currently does not work. Users will be offered the option to enable third party repositories again the first time they open GNOME Software. See: https://bugzilla.redhat.com/show_bug.cgi?id=2362164 See: https://gitlab.com/fedora/ostree/sig/-/issues/74 See: https://discussion.fedoraproject.org/t/cant-finish-first-boot-setup-or-lets-say-oobe-gets-frozen-stuck-in-the-middle-of-the-process/148889 --- diff --git a/silverblue-common.yaml b/silverblue-common.yaml index b6eedb8..bfe3c28 100644 --- a/silverblue-common.yaml +++ b/silverblue-common.yaml @@ -35,3 +35,18 @@ packages: exclude-packages: # Exclude GNOME Software's langpack plugin to avoid layering langpacks on Silverblue - gnome-software-fedora-langpacks + +# 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 +# Users will be offered the option to enable third party repositories again the +# first time they open GNOME Software. +postprocess: + - | + #!/bin/bash + set -xeuo pipefail + + cat > /usr/share/gnome-initial-setup/vendor.conf << 'EOF' + [pages] + # Do not show the Third Party Software page + skip=software + EOF From 8147ac5ba7a88fbb389b3ec6db0c62950f6db2a6 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Sep 22 2025 10:17:25 +0000 Subject: [PATCH 2/3] manifests: Remove cinnamon, lxqt, mate & xfce variants I added those variants a while back but they did not find a maintainer to turn them into official ones. They can be re-introduced if someone steps up to maintain them. --- diff --git a/cinnamon-atomic-packages.yaml b/cinnamon-atomic-packages.yaml deleted file mode 100644 index b81a77d..0000000 --- a/cinnamon-atomic-packages.yaml +++ /dev/null @@ -1,63 +0,0 @@ -# DO NOT EDIT! This content is generated from comps-sync.py -packages: - - NetworkManager-adsl - - NetworkManager-bluetooth - - NetworkManager-openconnect-gnome - - NetworkManager-openvpn-gnome - - NetworkManager-ppp - - NetworkManager-vpnc-gnome - - NetworkManager-wifi - - NetworkManager-wwan - - blueman - - cinnamon - - cinnamon-control-center - - cinnamon-screensaver - - ffmpegthumbnailer - - firefox - - firewall-config - - glx-utils - - gnome-disk-utility - - gnome-screenshot - - gnome-system-monitor - - gnome-terminal - - gstreamer1-plugins-ugly-free - - gvfs-archive - - gvfs-gphoto2 - - gvfs-mtp - - gvfs-smb - - imsettings-gsettings - - initial-setup-gui - - mesa-dri-drivers - - mesa-vulkan-drivers - - metacity - - nemo-fileroller - - nemo-image-converter - - nemo-preview - - nm-connection-editor - - pipewire-alsa - - pipewire-pulseaudio - - pluma - - plymouth-system-theme - - powerline - - qadwaitadecorations-qt5 - - setroubleshoot - - slick-greeter - - slick-greeter-cinnamon - - system-config-printer - - wireplumber - - xawtv - - xdg-user-dirs-gtk - - xorg-x11-drv-amdgpu - - xorg-x11-drv-ati - - xorg-x11-drv-evdev - - xorg-x11-drv-libinput - - xorg-x11-drv-nouveau - - xorg-x11-drv-qxl - - xorg-x11-drv-wacom - - xorg-x11-server-Xorg - - xorg-x11-xauth - - xorg-x11-xinit -packages-x86_64: - - xorg-x11-drv-intel - - xorg-x11-drv-openchrome - - xorg-x11-drv-vmware diff --git a/cinnamon-atomic.yaml b/cinnamon-atomic.yaml deleted file mode 100644 index 672d424..0000000 --- a/cinnamon-atomic.yaml +++ /dev/null @@ -1,23 +0,0 @@ -variables: - variant: "cinnamon-atomic" - -include: - - common.yaml - - cinnamon-atomic-packages.yaml - -ref: fedora/43/${basearch}/cinnamon -rojig: - name: fedora-cinnamon - summary: "Fedora Cinnamon Atomic" - license: MIT - -packages: - # Portals for Flatpak - - xdg-desktop-portal-gtk - # Include GUI to manage updates & Flatpaks - - gnome-software - -# Kept in the leaf manifest as they are overwritten by Pungi in composes -repos: - - fedora-43 - - fedora-43-updates diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index f0ee872..31e61cc 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -190,120 +190,9 @@ desktop_exclude_list: kde-mobile: # Already included by default for all variants - glibc-all-langpacks - xfce-desktop: - # Incompatible with ostree for various reasons - - abrt-desktop - - dnfdragora-updater - # Non-critical apps -> Flatpak - - fros-recordmydesktop - - tumbler - # Misc - - alsa-utils - - firewall-config - - openssh-askpass - - vim-enhanced - # Remove uncommon NetworkManager plugins - - NetworkManager-fortisslvpn-gnome - - NetworkManager-iodine-gnome - - NetworkManager-l2tp-gnome - - NetworkManager-libreswan-gnome - - NetworkManager-sstp-gnome - - NetworkManager-strongswan-gnome - xfce-apps: - # Non-critical apps -> Flatpak - - claws-mail - - catfish - - claws-mail-plugins-archive - - claws-mail-plugins-att-remover - - claws-mail-plugins-attachwarner - - claws-mail-plugins-fetchinfo - - claws-mail-plugins-mailmbox - - claws-mail-plugins-newmail - - claws-mail-plugins-notification - - claws-mail-plugins-pgp - - claws-mail-plugins-rssyl - - claws-mail-plugins-smime - - claws-mail-plugins-spam-report - - claws-mail-plugins-tnef - - claws-mail-plugins-vcalendar - - geany - - pidgin - - seahorse - - transmission - lxqt-desktop: - # Incompatible with ostree for various reasons - - dnfdragora-updater - # X11 is going away with Plasma 6 - - sddm-x11 - mate-desktop: - # Incompatible with ostree for various reasons - - abrt-desktop - - abrt-java-connector - - dnfdragora-updater - # Non-critical apps -> Flatpak - - blivet-gui - - filezilla - - gnome-disk-utility - - gnome-logs - - gnote - - gparted - - hexchat - - p7zip - - p7zip-plugins - - simple-scan - - thunderbird - - transmission-gtk - - vim-enhanced - - xfburn - - yelp - # Non critical NetworkManager plugins - - NetworkManager-iodine-gnome - - NetworkManager-l2tp-gnome - - NetworkManager-libreswan-gnome - - NetworkManager-ovs - - NetworkManager-sstp-gnome - - NetworkManager-strongswan-gnome - - NetworkManager-team - # Already in the common set - - wireplumber swaywm-extended: # Non-critical apps -> Flatpak - mpv - cinnamon-desktop: - # Incompatible with ostree for various reasons - - abrt-desktop - - abrt-java-connector - - dnfdragora-updater - # Will switch to Silverblue on rebases - - gnome-software - # Non-critical apps -> Flatpak & toolbox - - eom - - gnome-calculator - - gucharmap - - hexchat - - mpv - - pidgin - - sane-backends-drivers-scanners - - shotwell - - simple-scan - - thunderbird - - tmux - - tmux-powerline - - transmission - - vim-powerline - - xed - - xfburn - - xreader - # Not default to cinnamon - - paper-icon-theme - # Non critical NetworkManager plugins - - NetworkManager-iodine-gnome - - NetworkManager-l2tp-gnome - - NetworkManager-libreswan-gnome - - NetworkManager-ovs - - NetworkManager-sstp-gnome - - NetworkManager-strongswan-gnome - - NetworkManager-team cosmic-desktop-apps: # Non-critical apps -> Flatpak - gnome-calculator diff --git a/comps-sync.py b/comps-sync.py index 78b982f..67a77f9 100755 --- a/comps-sync.py +++ b/comps-sync.py @@ -194,15 +194,11 @@ def main(): # List of comps groups used for each variant variant_comps_groups = { "budgie-atomic": ["budgie-desktop", "budgie-desktop-apps", "base-x"], - "cinnamon-atomic": ["cinnamon-desktop", "base-x"], "cosmic-atomic": ["cosmic-desktop", "cosmic-desktop-apps", "base-graphical"], "kinoite": ["kde-desktop", "base-graphical"], "kinoite-mobile": ["kde-mobile", "kde-mobile-apps", "base-graphical"], - "lxqt-atomic": ["lxqt-desktop", "base-graphical"], - "mate-atomic": ["mate-desktop", "base-x"], "silverblue": ["gnome-desktop", "base-graphical"], "sway-atomic": ["swaywm", "swaywm-extended", "base-graphical"], - "xfce-atomic": ["xfce-desktop", "xfce-apps", "xfce-extra-plugins", "base-x"], } # Generate treefiles for all variants diff --git a/lxqt-atomic-packages.yaml b/lxqt-atomic-packages.yaml deleted file mode 100644 index ef090ba..0000000 --- a/lxqt-atomic-packages.yaml +++ /dev/null @@ -1,39 +0,0 @@ -# DO NOT EDIT! This content is generated from comps-sync.py -packages: - - breeze-cursor-theme - - breeze-gtk - - breeze-icon-theme - - falkon - - firewall-config - - initial-setup-gui - - lxqt-about - - lxqt-archiver - - lxqt-config - - lxqt-globalkeys - - lxqt-notificationd - - lxqt-openssh-askpass - - lxqt-panel - - lxqt-policykit - - lxqt-powermanagement - - lxqt-qtplugin - - lxqt-runner - - lxqt-session - - lxqt-themes - - lxqt-themes-fedora - - lxqt-wayland-session-default-compositor-miriway - - mesa-dri-drivers - - mesa-vulkan-drivers - - network-manager-applet - - nm-connection-editor - - notification-daemon - - obconf - - openbox - - pcmanfm-qt - - perl-File-MimeInfo - - plymouth-system-theme - - qterminal - - sddm - - sddm-themes - - sddm-wayland-miriway - - upower - - xdg-user-dirs diff --git a/lxqt-atomic.yaml b/lxqt-atomic.yaml deleted file mode 100644 index 76bb2f2..0000000 --- a/lxqt-atomic.yaml +++ /dev/null @@ -1,29 +0,0 @@ -variables: - variant: "lxqt-atomic" - exclude_perl: false - -include: - - common.yaml - - lxqt-atomic-packages.yaml - -ref: fedora/43/${basearch}/lazurite -rojig: - name: fedora-lxqt - summary: "Fedora LXQt Atomic" - license: MIT - -packages: - # Generic release package for desktop variants - - fedora-release - - fedora-release-ostree-desktop - - libqtxdg - - kvantum - - kwin-wayland - - plasma-systemsettings - # Portals for Flatpak - - xdg-desktop-portal-kde - -# Kept in the leaf manifest as they are overwritten by Pungi in composes -repos: - - fedora-43 - - fedora-43-updates diff --git a/mate-atomic-packages.yaml b/mate-atomic-packages.yaml deleted file mode 100644 index 4251435..0000000 --- a/mate-atomic-packages.yaml +++ /dev/null @@ -1,116 +0,0 @@ -# DO NOT EDIT! This content is generated from comps-sync.py -packages: - - NetworkManager-adsl - - NetworkManager-bluetooth - - NetworkManager-openconnect-gnome - - NetworkManager-openvpn-gnome - - NetworkManager-ppp - - NetworkManager-ssh-gnome - - NetworkManager-vpnc-gnome - - NetworkManager-wifi - - NetworkManager-wwan - - atril - - atril-caja - - atril-thumbnailer - - blueman - - caja - - caja-actions - - caja-image-converter - - caja-open-terminal - - caja-sendto - - caja-wallpaper - - caja-xattr-tags - - dconf-editor - - engrampa - - eom - - f38-backgrounds-base - - f38-backgrounds-extras-base - - f38-backgrounds-extras-mate - - f38-backgrounds-mate - - fedora-release-matecompiz - - firefox - - firewall-config - - glx-utils - - gnome-epub-thumbnailer - - gnome-themes-extra - - gstreamer1-plugins-ugly-free - - gtk2-engines - - gucharmap - - gvfs-afc - - gvfs-afp - - gvfs-archive - - gvfs-fuse - - gvfs-gphoto2 - - gvfs-mtp - - gvfs-nfs - - gvfs-smb - - initial-setup-gui - - libmatekbd - - libmatemixer - - libmateweather - - libsecret - - lightdm - - lm_sensors - - marco - - mate-applets - - mate-backgrounds - - mate-calc - - mate-control-center - - mate-desktop - - mate-dictionary - - mate-disk-usage-analyzer - - mate-icon-theme - - mate-media - - mate-menus - - mate-menus-preferences-category-menu - - mate-notification-daemon - - mate-panel - - mate-polkit - - mate-power-manager - - mate-screensaver - - mate-screenshot - - mate-search-tool - - mate-session-manager - - mate-settings-daemon - - mate-system-log - - mate-system-monitor - - mate-terminal - - mate-themes - - mate-user-admin - - mate-user-guide - - mesa-dri-drivers - - mesa-vulkan-drivers - - mozo - - network-manager-applet - - nm-connection-editor - - parole - - pavucontrol - - pipewire-alsa - - pipewire-pulseaudio - - pluma - - plymouth-system-theme - - seahorse - - seahorse-caja - - setroubleshoot - - slick-greeter-mate - - system-config-language - - system-config-printer - - system-config-printer-applet - - usermode-gtk - - xdg-user-dirs-gtk - - xmodmap - - xorg-x11-drv-amdgpu - - xorg-x11-drv-ati - - xorg-x11-drv-evdev - - xorg-x11-drv-libinput - - xorg-x11-drv-nouveau - - xorg-x11-drv-qxl - - xorg-x11-drv-wacom - - xorg-x11-server-Xorg - - xorg-x11-xauth - - xorg-x11-xinit - - xrdb -packages-x86_64: - - xorg-x11-drv-intel - - xorg-x11-drv-openchrome - - xorg-x11-drv-vmware diff --git a/mate-atomic.yaml b/mate-atomic.yaml deleted file mode 100644 index 0018583..0000000 --- a/mate-atomic.yaml +++ /dev/null @@ -1,26 +0,0 @@ -variables: - variant: "mate-atomic" - -include: - - common.yaml - - mate-atomic-packages.yaml - -ref: fedora/43/${basearch}/mate -rojig: - name: fedora-mate - summary: "Fedora Mate Atomic" - license: MIT - -packages: - # Generic release sub package for desktop variants - - fedora-release-ostree-desktop - # Portals for Flatpak - - xdg-desktop-portal-gtk - -exclude-packages: - - python3-unbound - -# Kept in the leaf manifest as they are overwritten by Pungi in composes -repos: - - fedora-43 - - fedora-43-updates diff --git a/xfce-atomic-packages.yaml b/xfce-atomic-packages.yaml deleted file mode 100644 index e72e577..0000000 --- a/xfce-atomic-packages.yaml +++ /dev/null @@ -1,92 +0,0 @@ -# DO NOT EDIT! This content is generated from comps-sync.py -packages: - - NetworkManager-openconnect-gnome - - NetworkManager-openvpn-gnome - - NetworkManager-ssh-gnome - - NetworkManager-vpnc-gnome - - Thunar - - adwaita-gtk2-theme - - adwaita-icon-theme - - atril - - blueman - - desktop-backgrounds-compat - - firefox - - galculator - - glx-utils - - gnome-keyring-pam - - gparted - - greybird-dark-theme - - greybird-light-theme - - greybird-xfce4-notifyd-theme - - greybird-xfwm4-theme - - gtk-xfce-engine - - gvfs - - gvfs-archive - - gvfs-mtp - - initial-setup-gui - - lightdm-gtk - - mesa-dri-drivers - - mesa-vulkan-drivers - - mint-y-theme - - mousepad - - network-manager-applet - - nm-connection-editor - - plymouth-system-theme - - ristretto - - thunar-archive-plugin - - thunar-media-tags-plugin - - thunar-volman - - xarchiver - - xdg-user-dirs-gtk - - xfce4-about - - xfce4-appfinder - - xfce4-battery-plugin - - xfce4-clipman-plugin - - xfce4-cpugraph-plugin - - xfce4-datetime-plugin - - xfce4-dict-plugin - - xfce4-diskperf-plugin - - xfce4-eyes-plugin - - xfce4-fsguard-plugin - - xfce4-genmon-plugin - - xfce4-mailwatch-plugin - - xfce4-mount-plugin - - xfce4-netload-plugin - - xfce4-panel - - xfce4-panel-profiles - - xfce4-places-plugin - - xfce4-power-manager - - xfce4-pulseaudio-plugin - - xfce4-screensaver - - xfce4-screenshooter-plugin - - xfce4-sensors-plugin - - xfce4-session - - xfce4-settings - - xfce4-systemload-plugin - - xfce4-taskmanager - - xfce4-terminal - - xfce4-time-out-plugin - - xfce4-verve-plugin - - xfce4-weather-plugin - - xfce4-whiskermenu-plugin - - xfce4-xkb-plugin - - xfconf - - xfdashboard - - xfdashboard-themes - - xfdesktop - - xfwm4 - - xfwm4-themes - - xorg-x11-drv-amdgpu - - xorg-x11-drv-ati - - xorg-x11-drv-evdev - - xorg-x11-drv-libinput - - xorg-x11-drv-nouveau - - xorg-x11-drv-qxl - - xorg-x11-drv-wacom - - xorg-x11-server-Xorg - - xorg-x11-xauth - - xorg-x11-xinit -packages-x86_64: - - xorg-x11-drv-intel - - xorg-x11-drv-openchrome - - xorg-x11-drv-vmware diff --git a/xfce-atomic.yaml b/xfce-atomic.yaml deleted file mode 100644 index b36d4c3..0000000 --- a/xfce-atomic.yaml +++ /dev/null @@ -1,25 +0,0 @@ -variables: - variant: "xfce-atomic" - exclude_perl: false - -include: - - common.yaml - - xfce-atomic-packages.yaml - -ref: fedora/43/${basearch}/vauxite -rojig: - name: fedora-vauxite - summary: "Fedora XFCE Atomic" - license: MIT - -packages: - - fedora-release-xfce - # Generic release sub package for desktop variants - - fedora-release-ostree-desktop - # Portals for Flatpak - - xdg-desktop-portal-gtk - -# Kept in the leaf manifest as they are overwritten by Pungi in composes -repos: - - fedora-43 - - fedora-43-updates From 91fc69c1fcd22ba2f22e70eac0934b975d845b65 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Sep 22 2025 10:44:25 +0000 Subject: [PATCH 3/3] comps-sync f43 2025-09-22 See: https://pagure.io/fedora-comps/pull-request/1168 --- diff --git a/silverblue-packages.yaml b/silverblue-packages.yaml index 37ffc18..19cab4e 100644 --- a/silverblue-packages.yaml +++ b/silverblue-packages.yaml @@ -53,6 +53,7 @@ packages: - rygel - systemd-oomd-defaults - tinysparql + - vte-profile - xdg-desktop-portal - xdg-desktop-portal-gnome - xdg-desktop-portal-gtk