From 2eed0a66fb20e2097b8e084fc5eb394ec333e437 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Oct 19 2025 23:11:04 +0000 Subject: [PATCH 1/29] REUSE: Misc changes to be REUSE compliant --- diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 7f8f94e..0000000 --- a/LICENSE +++ /dev/null @@ -1,19 +0,0 @@ -MIT License - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is furnished -to do so, subject to the following conditions: - -The above copyright notice and this permission notice (including the next -paragraph) shall be included in all copies or substantial portions of the -Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS -OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF -OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/LICENSES/MIT.txt b/LICENSES/MIT.txt new file mode 100644 index 0000000..d817195 --- /dev/null +++ b/LICENSES/MIT.txt @@ -0,0 +1,18 @@ +MIT License + +Copyright (c) + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and +associated documentation files (the "Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the +following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial +portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT +LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO +EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER +IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE +USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/REUSE.toml b/REUSE.toml new file mode 100644 index 0000000..562532a --- /dev/null +++ b/REUSE.toml @@ -0,0 +1,17 @@ +version = 1 + +[[annotations]] +path = [ + "*.repo", + "*.yaml", + ".gitignore", + "README.md", + "ci/*", + "comps-sync-exclude-list.yml", + "group", + "passwd", +] +SPDX-FileCopyrightText = [ + "Fedora Atomic Desktops maintainers", +] +SPDX-License-Identifier = "MIT" diff --git a/comps-sync.py b/comps-sync.py index 1445732..3da5f65 100755 --- a/comps-sync.py +++ b/comps-sync.py @@ -1,5 +1,8 @@ #!/usr/bin/python3 +# SPDX-FileCopyrightText: Fedora Atomic Desktops maintainers +# SPDX-License-Identifier: MIT + ''' Usage: ./comps-sync.py [--save] /path/to/comps-f42.xml.in diff --git a/generate-gitlab-ci.sh b/generate-gitlab-ci.sh index 33aa077..30b6850 100755 --- a/generate-gitlab-ci.sh +++ b/generate-gitlab-ci.sh @@ -1,4 +1,6 @@ #!/bin/bash + +# SPDX-FileCopyrightText: Fedora Atomic Desktops maintainers # SPDX-License-Identifier: MIT set -euo pipefail @@ -26,6 +28,7 @@ fi { cat < Date: Oct 25 2025 15:29:59 +0000 Subject: [PATCH 2/29] 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 92eb7fe..0a7d38f 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 # Make sure the following are not pulled in when Recommended by other packages exclude-packages: From aa005b98c3dd50d2f09fef9655783620b4d7fe73 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Oct 25 2025 15:29:59 +0000 Subject: [PATCH 3/29] manifests: Update metadata --- diff --git a/base-atomic.yaml b/base-atomic.yaml index ce44d94..4353c9c 100644 --- a/base-atomic.yaml +++ b/base-atomic.yaml @@ -1,15 +1,14 @@ +metadata: + summary: "Fedora Base Atomic" + variables: variant: "base-atomic" +ref: fedora/42/${basearch}/base-atomic + include: - common.yaml -ref: fedora/42/${basearch}/base -rojig: - name: fedora-base - summary: "Fedora Base Atomic" - license: MIT - packages: # Generic release package for desktop variants - fedora-release diff --git a/budgie-atomic-common.yaml b/budgie-atomic-common.yaml index 0c2519c..71ae7d2 100644 --- a/budgie-atomic-common.yaml +++ b/budgie-atomic-common.yaml @@ -1,16 +1,15 @@ +metadata: + summary: "Fedora Budgie Atomic" + variables: variant: "budgie-atomic" +ref: fedora/42/${basearch}/onyx + include: - common.yaml - budgie-atomic-packages.yaml -ref: fedora/42/${basearch}/onyx -rojig: - name: fedora-onyx - summary: "Fedora Budgie Atomic" - license: MIT - packages: - fedora-release-budgie-atomic # Make sure that GNOME Software's rpm-ostree plugin is always installed diff --git a/cinnamon-atomic.yaml b/cinnamon-atomic.yaml index 06903bc..a4cf8fb 100644 --- a/cinnamon-atomic.yaml +++ b/cinnamon-atomic.yaml @@ -1,16 +1,15 @@ +metadata: + summary: "Fedora Cinnamon Atomic" + variables: variant: "cinnamon-atomic" +ref: fedora/42/${basearch}/cinnamon-atomic + include: - common.yaml - cinnamon-atomic-packages.yaml -ref: fedora/42/${basearch}/cinnamon -rojig: - name: fedora-cinnamon - summary: "Fedora Cinnamon Atomic" - license: MIT - packages: # Portals for Flatpak - xdg-desktop-portal-gtk diff --git a/cosmic-atomic-common.yaml b/cosmic-atomic-common.yaml index 2b5cfc6..7bc3e9f 100644 --- a/cosmic-atomic-common.yaml +++ b/cosmic-atomic-common.yaml @@ -1,16 +1,15 @@ +metadata: + summary: "Fedora COSMIC Atomic" + variables: variant: "cosmic-atomic" +ref: fedora/42/${basearch}/cosmic-atomic + include: - common.yaml - cosmic-atomic-packages.yaml -ref: fedora/42/${basearch}/cosmic-atomic -rojig: - name: fedora-cosmic - summary: "Fedora COSMIC Atomic" - license: MIT - packages: - fedora-release-cosmic-atomic # Portals for Flatpak diff --git a/deepin-atomic.yaml b/deepin-atomic.yaml index 878efce..7e38b6b 100644 --- a/deepin-atomic.yaml +++ b/deepin-atomic.yaml @@ -1,16 +1,15 @@ +metadata: + summary: "Fedora Deepin Atomic" + variables: variant: "deepin-atomic" +ref: fedora/42/${basearch}/deepin-atomic + include: - common.yaml - deepin-atomic-packages.yaml -ref: fedora/42/${basearch}/deepin -rojig: - name: fedora-deepin - summary: "Fedora Deepin Atomic" - license: MIT - packages: # Generic release package for desktop variants - fedora-release diff --git a/kinoite-common.yaml b/kinoite-common.yaml index a357f77..7b8097f 100644 --- a/kinoite-common.yaml +++ b/kinoite-common.yaml @@ -1,10 +1,16 @@ -include: - - common.yaml +metadata: + summary: "Fedora Kinoite" # Default to Kinoite and override in Kinoite Mobile manifests variables: variant: "kinoite" +# Default to Kinoite (Desktop). Overriden in the Kinoite Mobile manifest +ref: fedora/42/${basearch}/kinoite + +include: + - common.yaml + conditional-include: - if: variant == "kinoite" include: @@ -13,13 +19,6 @@ conditional-include: include: - kinoite-mobile-packages.yaml -# Default to Kinoite (Desktop). Overriden in the Kinoite Mobile manifest -ref: fedora/42/${basearch}/kinoite -rojig: - name: fedora-kde - summary: "Fedora Kinoite" - license: MIT - packages: - fedora-release-kinoite # Install some minor optional tools for KInfoCenter diff --git a/kinoite-mobile.yaml b/kinoite-mobile.yaml index 0c785ac..72b9ecc 100644 --- a/kinoite-mobile.yaml +++ b/kinoite-mobile.yaml @@ -1,15 +1,14 @@ +metadata: + summary: "Fedora Kinoite Mobile" + variables: variant: "kinoite-mobile" -include: - - kinoite-common.yaml - # Override the default Kinoite ref from the kinoite-common.yaml manifest ref: fedora/42/${basearch}/kinoite-mobile -rojig: - name: fedora-kde - summary: "Fedora Kinoite Mobile" - license: MIT + +include: + - kinoite-common.yaml # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: diff --git a/lxqt-atomic.yaml b/lxqt-atomic.yaml index b7ac02a..5ef2af7 100644 --- a/lxqt-atomic.yaml +++ b/lxqt-atomic.yaml @@ -1,17 +1,16 @@ +metadata: + summary: "Fedora LXQt Atomic" + variables: variant: "lxqt-atomic" exclude_perl: false +ref: fedora/42/${basearch}/lazurite + include: - common.yaml - lxqt-atomic-packages.yaml -ref: fedora/42/${basearch}/lazurite -rojig: - name: fedora-lxqt - summary: "Fedora LXQt Atomic" - license: MIT - packages: # Generic release package for desktop variants - fedora-release diff --git a/mate-atomic.yaml b/mate-atomic.yaml index ef8103f..100e479 100644 --- a/mate-atomic.yaml +++ b/mate-atomic.yaml @@ -1,16 +1,15 @@ +metadata: + summary: "Fedora Mate Atomic" + variables: variant: "mate-atomic" +ref: fedora/42/${basearch}/mate-atomic + include: - common.yaml - mate-atomic-packages.yaml -ref: fedora/42/${basearch}/mate -rojig: - name: fedora-mate - summary: "Fedora Mate Atomic" - license: MIT - packages: # Generic release sub package for desktop variants - fedora-release-ostree-desktop diff --git a/silverblue-common.yaml b/silverblue-common.yaml index 0a7d38f..aad47a2 100644 --- a/silverblue-common.yaml +++ b/silverblue-common.yaml @@ -1,16 +1,15 @@ +metadata: + summary: "Fedora Silverblue" + variables: variant: "silverblue" +ref: fedora/42/${basearch}/silverblue + include: - common.yaml - silverblue-packages.yaml -ref: fedora/42/${basearch}/silverblue -rojig: - name: fedora-silverblue - summary: "Fedora Silverblue" - license: MIT - packages: - fedora-release-silverblue - desktop-backgrounds-gnome diff --git a/sway-atomic-common.yaml b/sway-atomic-common.yaml index 81eb8d3..dd45260 100644 --- a/sway-atomic-common.yaml +++ b/sway-atomic-common.yaml @@ -1,16 +1,15 @@ +metadata: + summary: "Fedora Sway Atomic" + variables: variant: "sway-atomic" +ref: fedora/42/${basearch}/sericea + include: - common.yaml - sway-atomic-packages.yaml -ref: fedora/42/${basearch}/sericea -rojig: - name: fedora-sericea - summary: "Fedora Sway Atomic" - license: MIT - packages: - fedora-release-sway-atomic # explicitly list some defaults diff --git a/xfce-atomic.yaml b/xfce-atomic.yaml index e089bef..2e3e695 100644 --- a/xfce-atomic.yaml +++ b/xfce-atomic.yaml @@ -1,17 +1,16 @@ +metadata: + summary: "Fedora XFCE Atomic" + variables: variant: "xfce-atomic" exclude_perl: false +ref: fedora/42/${basearch}/xfce-atomic + include: - common.yaml - xfce-atomic-packages.yaml -ref: fedora/42/${basearch}/vauxite -rojig: - name: fedora-vauxite - summary: "Fedora XFCE Atomic" - license: MIT - packages: - fedora-release-xfce # Generic release sub package for desktop variants From 97cbf4096904d607767c6b50e9ab34a19bcb3d92 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Oct 25 2025 15:29:59 +0000 Subject: [PATCH 4/29] common: Remove explicit bootc inclusion bootc is now a dependency of rpm-ostree and thus always included. --- diff --git a/bootc.yaml b/bootc.yaml deleted file mode 100644 index 91a4aa3..0000000 --- a/bootc.yaml +++ /dev/null @@ -1,4 +0,0 @@ -# Add bootc for Bootable Container images -# See: https://fedoraproject.org/wiki/Changes/DNFAndBootcInImageModeFedora -packages: - - bootc diff --git a/common.yaml b/common.yaml index e306b87..753ab82 100644 --- a/common.yaml +++ b/common.yaml @@ -40,7 +40,6 @@ conditional-include: # Manifests included only for the Bootable Container variants - if: bootable_container == true include: - - bootc.yaml - dnf5.yaml - if: exclude_perl == true include: From 917ceef2d7965f77090f1e083bd91d80379814a2 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Oct 25 2025 15:29:59 +0000 Subject: [PATCH 5/29] common: Use 2024 edition See: https://coreos.github.io/rpm-ostree/treefile/ --- diff --git a/common.yaml b/common.yaml index 753ab82..bb70a1f 100644 --- a/common.yaml +++ b/common.yaml @@ -1,3 +1,4 @@ +edition: "2024" releasever: 42 automatic-version-prefix: "${releasever}." mutate-os-release: "${releasever}" @@ -104,10 +105,8 @@ packages: selinux: true documentation: true -boot-location: modules etc-group-members: - wheel -tmp-is-dir: true ignore-removed-users: - root From 7d7e602d5913b194a6d2c124e0fc3efd2a32945b Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Oct 25 2025 15:29:59 +0000 Subject: [PATCH 6/29] common: Always exclude gnome-software-fedora-langpacks --- diff --git a/budgie-atomic-common.yaml b/budgie-atomic-common.yaml index 71ae7d2..0efa98e 100644 --- a/budgie-atomic-common.yaml +++ b/budgie-atomic-common.yaml @@ -22,5 +22,3 @@ exclude-packages: - tracker-miners - localsearch - tinysparql - # Exclude GNOME Software's langpack plugin to avoid layering langpacks on Silverblue - - gnome-software-fedora-langpacks diff --git a/common.yaml b/common.yaml index bb70a1f..0310cfd 100644 --- a/common.yaml +++ b/common.yaml @@ -155,6 +155,9 @@ exclude-packages: - qemu-device-display-virtio-vga # See: https://github.com/fedora-silverblue/issue-tracker/issues/646 - hplip-gui + # Exclude GNOME Software's langpack plugin to avoid layering langpacks on + # systems where GNOME Software is included + - gnome-software-fedora-langpacks postprocess: - | diff --git a/silverblue-common.yaml b/silverblue-common.yaml index aad47a2..f14023a 100644 --- a/silverblue-common.yaml +++ b/silverblue-common.yaml @@ -32,8 +32,3 @@ packages: # Needed for GSConnect extension # See: https://github.com/fedora-silverblue/issue-tracker/issues/201 - openssl - -# Make sure the following are not pulled in when Recommended by other packages -exclude-packages: - # Exclude GNOME Software's langpack plugin to avoid layering langpacks on Silverblue - - gnome-software-fedora-langpacks From a9fefbb43ec7ee30ad51d5f28fa99fb053cfdc36 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Oct 25 2025 15:29:59 +0000 Subject: [PATCH 7/29] common: Always exclude PackageKit-glib --- diff --git a/common.yaml b/common.yaml index 0310cfd..9ea3fbc 100644 --- a/common.yaml +++ b/common.yaml @@ -136,6 +136,7 @@ packages-x86_64: # Make sure the following are not pulled in when Recommended by other packages exclude-packages: - PackageKit + - PackageKit-glib # We can not include openh264. See https://fedoraproject.org/wiki/OpenH264 - gstreamer1-plugin-openh264 - mozilla-openh264 diff --git a/sway-atomic-common.yaml b/sway-atomic-common.yaml index dd45260..13ef6f0 100644 --- a/sway-atomic-common.yaml +++ b/sway-atomic-common.yaml @@ -16,9 +16,6 @@ packages: - firefox exclude-packages: - # already excluded in comps-sync-exclude-list - - PackageKit-glib - - grubby # nothing in the tree would use these - tracker - tracker-miners From be81e28280db60e2717f71b16b3538c13cd27721 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Oct 25 2025 15:29:59 +0000 Subject: [PATCH 8/29] budgie: Remove gnome-software-rpm-ostree Budgie Atomic uses Plasma Discover now. --- diff --git a/budgie-atomic-common.yaml b/budgie-atomic-common.yaml index 0efa98e..0c965d1 100644 --- a/budgie-atomic-common.yaml +++ b/budgie-atomic-common.yaml @@ -12,8 +12,6 @@ include: packages: - fedora-release-budgie-atomic - # Make sure that GNOME Software's rpm-ostree plugin is always installed - - gnome-software-rpm-ostree # Make sure the following are not pulled in when Recommended by other packages exclude-packages: From 78a8777fd6e9a5f08731a95053340b4ccd673b99 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Oct 25 2025 15:29:59 +0000 Subject: [PATCH 9/29] packages: Move comps sync'ed package lists to a sub dir Those manifests are automatically generated so let's move them out of the way as we never edit them manually. --- diff --git a/REUSE.toml b/REUSE.toml index 562532a..d2a20ea 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -4,6 +4,7 @@ version = 1 path = [ "*.repo", "*.yaml", + "packages/*.yaml", ".gitignore", "README.md", "ci/*", diff --git a/budgie-atomic-common.yaml b/budgie-atomic-common.yaml index 0c965d1..4722e96 100644 --- a/budgie-atomic-common.yaml +++ b/budgie-atomic-common.yaml @@ -8,7 +8,7 @@ ref: fedora/42/${basearch}/onyx include: - common.yaml - - budgie-atomic-packages.yaml + - packages/budgie-atomic.yaml packages: - fedora-release-budgie-atomic diff --git a/budgie-atomic-packages.yaml b/budgie-atomic-packages.yaml deleted file mode 100644 index bc90d07..0000000 --- a/budgie-atomic-packages.yaml +++ /dev/null @@ -1,67 +0,0 @@ -# DO NOT EDIT! This content is generated from comps-sync.py -packages: - - ModemManager - - NetworkManager-adsl - - NetworkManager-openconnect-gnome - - NetworkManager-openvpn-gnome - - NetworkManager-ppp - - NetworkManager-pptp-gnome - - NetworkManager-ssh-gnome - - NetworkManager-vpnc-gnome - - NetworkManager-wwan - - budgie-backgrounds - - budgie-control-center - - budgie-desktop - - budgie-desktop-defaults - - budgie-desktop-view - - budgie-screensaver - - dconf - - firefox - - fprintd-pam - - gedit - - glib-networking - - glx-utils - - gnome-bluetooth - - gnome-color-manager - - gnome-disk-utility - - gnome-keyring-pam - - gnome-settings-daemon - - gnome-system-monitor - - gnome-terminal - - gvfs-afc - - gvfs-afp - - gvfs-archive - - gvfs-fuse - - gvfs-goa - - gvfs-gphoto2 - - gvfs-mtp - - gvfs-smb - - lightdm - - mesa-dri-drivers - - mesa-vulkan-drivers - - nemo - - nemo-fileroller - - nemo-seahorse - - network-manager-applet - - plasma-discover - - plymouth-system-theme - - polkit - - seahorse - - slick-greeter - - xdg-desktop-portal - - xdg-desktop-portal-gtk - - 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-packages.yaml b/cinnamon-atomic-packages.yaml deleted file mode 100644 index ab78166..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-pptp-gnome - - 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 - - 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 index a4cf8fb..e042bc6 100644 --- a/cinnamon-atomic.yaml +++ b/cinnamon-atomic.yaml @@ -8,7 +8,7 @@ ref: fedora/42/${basearch}/cinnamon-atomic include: - common.yaml - - cinnamon-atomic-packages.yaml + - packages/cinnamon-atomic.yaml packages: # Portals for Flatpak diff --git a/common-packages.yaml b/common-packages.yaml deleted file mode 100644 index b07fc61..0000000 --- a/common-packages.yaml +++ /dev/null @@ -1,209 +0,0 @@ -# DO NOT EDIT! This content is generated from comps-sync.py -packages: - - NetworkManager - - NetworkManager-bluetooth - - NetworkManager-config-connectivity-fedora - - NetworkManager-wifi - - NetworkManager-wwan - - acl - - alsa-ucm - - alsa-utils - - amd-gpu-firmware - - at-spi2-atk - - at-spi2-core - - atheros-firmware - - attr - - audit - - b43-fwcutter - - b43-openfwwf - - basesystem - - bash - - bash-color-prompt - - bash-completion - - bc - - bind-utils - - bluez-cups - - brcmfmac-firmware - - brltty - - btrfs-progs - - bzip2 - - chrony - - cifs-utils - - colord - - compsize - - coreutils - - cpio - - cryptsetup - - cups - - cups-browsed - - cups-filters - - curl - - cyrus-sasl-plain - - default-editor - - default-fonts-cjk-mono - - default-fonts-cjk-sans - - default-fonts-cjk-serif - - default-fonts-core-emoji - - default-fonts-core-math - - default-fonts-core-mono - - default-fonts-core-sans - - default-fonts-core-serif - - default-fonts-other-mono - - default-fonts-other-sans - - default-fonts-other-serif - - dhcp-client - - dnsmasq - - e2fsprogs - - ethtool - - exfatprogs - - fedora-bookmarks - - fedora-chromium-config - - fedora-flathub-remote - - fedora-workstation-backgrounds - - fedora-workstation-repositories - - file - - filesystem - - firefox - - firewalld - - fpaste - - fros-gnome - - fwupd - - gamemode - - glibc - - glibc-all-langpacks - - gnupg2 - - gstreamer1-plugin-dav1d - - gstreamer1-plugin-libav - - gstreamer1-plugins-bad-free - - gstreamer1-plugins-good - - gstreamer1-plugins-ugly-free - - gutenprint - - gutenprint-cups - - hostname - - hplip - - hunspell - - hyperv-daemons - - ibus-anthy - - ibus-chewing - - ibus-gtk3 - - ibus-gtk4 - - ibus-hangul - - ibus-libpinyin - - ibus-m17n - - ibus-typing-booster - - intel-gpu-firmware - - iproute - - iptables-nft - - iptstate - - iputils - - iwlegacy-firmware - - iwlwifi-dvm-firmware - - iwlwifi-mvm-firmware - - kbd - - less - - libertas-firmware - - libglvnd-gles - - linux-firmware - - logrotate - - lrzsz - - lsof - - man-db - - man-pages - - mdadm - - mesa-dri-drivers - - mesa-vulkan-drivers - - mpage - - mt7xxx-firmware - - mtr - - nfs-utils - - nss-altfiles - - nss-mdns - - ntfs-3g - - ntfsprogs - - nvidia-gpu-firmware - - nxpwireless-firmware - - open-vm-tools-desktop - - opensc - - openssh-clients - - openssh-server - - orca - - pam_afs_session - - paps - - passwdqc - - pciutils - - pinfo - - pipewire-alsa - - pipewire-gstreamer - - pipewire-pulseaudio - - pipewire-utils - - plocate - - plymouth - - plymouth-system-theme - - policycoreutils - - policycoreutils-python-utils - - prefixdevname - - procps-ng - - psmisc - - qcom-wwan-firmware - - qemu-guest-agent - - qt5-qtbase - - qt5-qtbase-gui - - qt5-qtdeclarative - - qt5-qtxmlpatterns - - quota - - realmd - - realtek-firmware - - rootfiles - - rpm - - rpm-ostree - - rsync - - samba-client - - selinux-policy-targeted - - setup - - shadow-utils - - sos - - speech-dispatcher - - spice-vdagent - - spice-webdavd - - sssd-common - - sssd-kcm - - sudo - - system-config-printer-udev - - systemd - - systemd-oomd-defaults - - systemd-resolved - - systemd-udev - - tar - - time - - tiwilink-firmware - - toolbox - - tree - - unzip - - uresourced - - usb_modeswitch - - usbutils - - util-linux - - vim-minimal - - wget2-wget - - which - - whois - - wireplumber - - words - - wpa_supplicant - - zip - - zram-generator-defaults -packages-x86_64: - - alsa-sof-firmware - - amd-ucode-firmware - - cirrus-audio-firmware - - intel-audio-firmware - - intel-vsc-firmware - - libva-intel-media-driver - - mcelog - - microcode_ctl - - thermald - - virtualbox-guest-additions -packages-aarch64: - - qcom-firmware - - qrtr - - rmtfs diff --git a/common.yaml b/common.yaml index 9ea3fbc..cb1c54d 100644 --- a/common.yaml +++ b/common.yaml @@ -15,7 +15,7 @@ container-cmd: include: # Packages common to all variants - - common-packages.yaml + - packages/common.yaml # See: https://gitlab.com/fedora/ostree/sig/-/issues/1 - bootupd.yaml # Dracut configuration for the initramfs diff --git a/comps-sync.py b/comps-sync.py index 3da5f65..6efb106 100755 --- a/comps-sync.py +++ b/comps-sync.py @@ -192,7 +192,7 @@ def main(): # Return code indicates if changes have or would have been done ret = 0 - ret += update_manifests_from_groups(comps, groups, 'common-packages.yaml', "common", args.save, comps_exclude_list, comps_exclude_list_all) + ret += update_manifests_from_groups(comps, groups, 'packages/common.yaml', "common", args.save, comps_exclude_list, comps_exclude_list_all) # List of comps groups used for each variant variant_comps_groups = { @@ -212,7 +212,7 @@ def main(): # Generate treefiles for all variants for variant, groups in variant_comps_groups.items(): print() - ret += update_manifests_from_groups(comps, groups, f'{variant}-packages.yaml', variant, args.save, comps_desktop_exclude_list, comps_exclude_list_all) + ret += update_manifests_from_groups(comps, groups, f'packages/{variant}.yaml', variant, args.save, comps_desktop_exclude_list, comps_exclude_list_all) if not args.save and ret != 0: sys.exit(1) diff --git a/cosmic-atomic-common.yaml b/cosmic-atomic-common.yaml index 7bc3e9f..1df421d 100644 --- a/cosmic-atomic-common.yaml +++ b/cosmic-atomic-common.yaml @@ -8,7 +8,7 @@ ref: fedora/42/${basearch}/cosmic-atomic include: - common.yaml - - cosmic-atomic-packages.yaml + - packages/cosmic-atomic.yaml packages: - fedora-release-cosmic-atomic diff --git a/cosmic-atomic-packages.yaml b/cosmic-atomic-packages.yaml deleted file mode 100644 index 2c25ee2..0000000 --- a/cosmic-atomic-packages.yaml +++ /dev/null @@ -1,18 +0,0 @@ -# DO NOT EDIT! This content is generated from comps-sync.py -packages: - - ark - - cosmic-edit - - cosmic-files - - cosmic-player - - cosmic-session - - cosmic-store - - cosmic-term - - flatpak - - gnome-disk-utility - - gnome-keyring-pam - - gnome-system-monitor - - initial-setup-gui - - mesa-dri-drivers - - mesa-vulkan-drivers - - plymouth-system-theme - - toolbox diff --git a/deepin-atomic-packages.yaml b/deepin-atomic-packages.yaml deleted file mode 100644 index 8effca7..0000000 --- a/deepin-atomic-packages.yaml +++ /dev/null @@ -1,32 +0,0 @@ -# DO NOT EDIT! This content is generated from comps-sync.py -packages: - - chromium - - deepin-calculator - - deepin-calendar - - deepin-desktop - - deepin-editor - - deepin-file-manager - - deepin-icon-theme - - deepin-image-viewer - - deepin-picker - - deepin-screenshot - - deepin-system-monitor - - firewall-config - - glx-utils - - mesa-dri-drivers - - mesa-vulkan-drivers - - plymouth-system-theme - - 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/deepin-atomic.yaml b/deepin-atomic.yaml index 7e38b6b..f3e493d 100644 --- a/deepin-atomic.yaml +++ b/deepin-atomic.yaml @@ -8,7 +8,7 @@ ref: fedora/42/${basearch}/deepin-atomic include: - common.yaml - - deepin-atomic-packages.yaml + - packages/deepin-atomic.yaml packages: # Generic release package for desktop variants diff --git a/kinoite-common.yaml b/kinoite-common.yaml index 7b8097f..1dc7929 100644 --- a/kinoite-common.yaml +++ b/kinoite-common.yaml @@ -14,10 +14,10 @@ include: conditional-include: - if: variant == "kinoite" include: - - kinoite-packages.yaml + - packages/kinoite.yaml - if: variant == "kinoite-mobile" include: - - kinoite-mobile-packages.yaml + - packages/kinoite-mobile.yaml packages: - fedora-release-kinoite diff --git a/kinoite-mobile-packages.yaml b/kinoite-mobile-packages.yaml deleted file mode 100644 index 60b37ef..0000000 --- a/kinoite-mobile-packages.yaml +++ /dev/null @@ -1,32 +0,0 @@ -# DO NOT EDIT! This content is generated from comps-sync.py -packages: - - angelfish - - arianna - - bluedevil - - elisa-player - - haruna - - kalk - - kasts - - kclock - - keysmith - - koko - - krecorder - - kweather - - marknote - - mesa-dri-drivers - - mesa-vulkan-drivers - - neochat - - okular-mobile - - plasma-discover - - plasma-discover-notifier - - plasma-mobile - - plasma-mobile-sounds - - plasma-settings - - plymouth-system-theme - - qmlkonsole - - qrca - - sddm - - sddm-themes - - sddm-wayland-plasma - - spacebar - - tokodon diff --git a/kinoite-packages.yaml b/kinoite-packages.yaml deleted file mode 100644 index c41fd09..0000000 --- a/kinoite-packages.yaml +++ /dev/null @@ -1,87 +0,0 @@ -# DO NOT EDIT! This content is generated from comps-sync.py -packages: - - NetworkManager-config-connectivity-fedora - - akonadi-server - - akonadi-server-mysql - - ark - - audiocd-kio - - bluedevil - - breeze-icon-theme - - colord-kde - - dolphin - - ffmpegthumbs - - filelight - - firewall-config - - flatpak-kcm - - fprintd-pam - - kaccounts-integration-qt6 - - kaccounts-providers - - kcharselect - - kde-connect - - kde-gtk-config - - kde-inotify-survey - - kde-partitionmanager - - kde-settings-pulseaudio - - kdebugsettings - - kdegraphics-thumbnailers - - kdenetwork-filesharing - - kdeplasma-addons - - kdialog - - kdnssd - - kf6-baloo-file - - kfind - - khelpcenter - - kinfocenter - - kio-admin - - kio-gdrive - - kjournald - - kmenuedit - - konsole - - krdp - - krfb - - kscreen - - kscreenlocker - - kunifiedpush - - kwalletmanager5 - - kwin - - kwrite - - libappindicator-gtk3 - - mesa-dri-drivers - - mesa-vulkan-drivers - - pam-kwallet - - phonon-qt6-backend-vlc - - pinentry-qt - - plasma-breeze - - plasma-desktop - - plasma-desktop-doc - - plasma-discover - - plasma-discover-notifier - - plasma-disks - - plasma-drkonqi - - plasma-nm - - plasma-nm-openconnect - - plasma-nm-openvpn - - plasma-nm-vpnc - - plasma-pa - - plasma-print-manager - - plasma-systemmonitor - - plasma-thunderbolt - - plasma-vault - - plasma-welcome - - plasma-workspace - - plasma-workspace-wallpapers - - plymouth-system-theme - - polkit-kde - - samba-usershares - - sddm - - sddm-breeze - - sddm-kcm - - sddm-wayland-plasma - - signon-kwallet-extension - - spectacle - - systemd-oomd-defaults - - udisks2 - - vlc-plugin-gstreamer - - xwaylandvideobridge -packages-x86_64: - - thermald 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 index 5ef2af7..0270c1f 100644 --- a/lxqt-atomic.yaml +++ b/lxqt-atomic.yaml @@ -9,7 +9,7 @@ ref: fedora/42/${basearch}/lazurite include: - common.yaml - - lxqt-atomic-packages.yaml + - packages/lxqt-atomic.yaml packages: # Generic release package for desktop variants diff --git a/mate-atomic-packages.yaml b/mate-atomic-packages.yaml deleted file mode 100644 index 4ccabe5..0000000 --- a/mate-atomic-packages.yaml +++ /dev/null @@ -1,117 +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-pptp-gnome - - 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 index 100e479..05a1602 100644 --- a/mate-atomic.yaml +++ b/mate-atomic.yaml @@ -8,7 +8,7 @@ ref: fedora/42/${basearch}/mate-atomic include: - common.yaml - - mate-atomic-packages.yaml + - packages/mate-atomic.yaml packages: # Generic release sub package for desktop variants diff --git a/packages/budgie-atomic.yaml b/packages/budgie-atomic.yaml new file mode 100644 index 0000000..bc90d07 --- /dev/null +++ b/packages/budgie-atomic.yaml @@ -0,0 +1,67 @@ +# DO NOT EDIT! This content is generated from comps-sync.py +packages: + - ModemManager + - NetworkManager-adsl + - NetworkManager-openconnect-gnome + - NetworkManager-openvpn-gnome + - NetworkManager-ppp + - NetworkManager-pptp-gnome + - NetworkManager-ssh-gnome + - NetworkManager-vpnc-gnome + - NetworkManager-wwan + - budgie-backgrounds + - budgie-control-center + - budgie-desktop + - budgie-desktop-defaults + - budgie-desktop-view + - budgie-screensaver + - dconf + - firefox + - fprintd-pam + - gedit + - glib-networking + - glx-utils + - gnome-bluetooth + - gnome-color-manager + - gnome-disk-utility + - gnome-keyring-pam + - gnome-settings-daemon + - gnome-system-monitor + - gnome-terminal + - gvfs-afc + - gvfs-afp + - gvfs-archive + - gvfs-fuse + - gvfs-goa + - gvfs-gphoto2 + - gvfs-mtp + - gvfs-smb + - lightdm + - mesa-dri-drivers + - mesa-vulkan-drivers + - nemo + - nemo-fileroller + - nemo-seahorse + - network-manager-applet + - plasma-discover + - plymouth-system-theme + - polkit + - seahorse + - slick-greeter + - xdg-desktop-portal + - xdg-desktop-portal-gtk + - 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/packages/cinnamon-atomic.yaml b/packages/cinnamon-atomic.yaml new file mode 100644 index 0000000..ab78166 --- /dev/null +++ b/packages/cinnamon-atomic.yaml @@ -0,0 +1,63 @@ +# 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-pptp-gnome + - 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 + - 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/packages/common.yaml b/packages/common.yaml new file mode 100644 index 0000000..b07fc61 --- /dev/null +++ b/packages/common.yaml @@ -0,0 +1,209 @@ +# DO NOT EDIT! This content is generated from comps-sync.py +packages: + - NetworkManager + - NetworkManager-bluetooth + - NetworkManager-config-connectivity-fedora + - NetworkManager-wifi + - NetworkManager-wwan + - acl + - alsa-ucm + - alsa-utils + - amd-gpu-firmware + - at-spi2-atk + - at-spi2-core + - atheros-firmware + - attr + - audit + - b43-fwcutter + - b43-openfwwf + - basesystem + - bash + - bash-color-prompt + - bash-completion + - bc + - bind-utils + - bluez-cups + - brcmfmac-firmware + - brltty + - btrfs-progs + - bzip2 + - chrony + - cifs-utils + - colord + - compsize + - coreutils + - cpio + - cryptsetup + - cups + - cups-browsed + - cups-filters + - curl + - cyrus-sasl-plain + - default-editor + - default-fonts-cjk-mono + - default-fonts-cjk-sans + - default-fonts-cjk-serif + - default-fonts-core-emoji + - default-fonts-core-math + - default-fonts-core-mono + - default-fonts-core-sans + - default-fonts-core-serif + - default-fonts-other-mono + - default-fonts-other-sans + - default-fonts-other-serif + - dhcp-client + - dnsmasq + - e2fsprogs + - ethtool + - exfatprogs + - fedora-bookmarks + - fedora-chromium-config + - fedora-flathub-remote + - fedora-workstation-backgrounds + - fedora-workstation-repositories + - file + - filesystem + - firefox + - firewalld + - fpaste + - fros-gnome + - fwupd + - gamemode + - glibc + - glibc-all-langpacks + - gnupg2 + - gstreamer1-plugin-dav1d + - gstreamer1-plugin-libav + - gstreamer1-plugins-bad-free + - gstreamer1-plugins-good + - gstreamer1-plugins-ugly-free + - gutenprint + - gutenprint-cups + - hostname + - hplip + - hunspell + - hyperv-daemons + - ibus-anthy + - ibus-chewing + - ibus-gtk3 + - ibus-gtk4 + - ibus-hangul + - ibus-libpinyin + - ibus-m17n + - ibus-typing-booster + - intel-gpu-firmware + - iproute + - iptables-nft + - iptstate + - iputils + - iwlegacy-firmware + - iwlwifi-dvm-firmware + - iwlwifi-mvm-firmware + - kbd + - less + - libertas-firmware + - libglvnd-gles + - linux-firmware + - logrotate + - lrzsz + - lsof + - man-db + - man-pages + - mdadm + - mesa-dri-drivers + - mesa-vulkan-drivers + - mpage + - mt7xxx-firmware + - mtr + - nfs-utils + - nss-altfiles + - nss-mdns + - ntfs-3g + - ntfsprogs + - nvidia-gpu-firmware + - nxpwireless-firmware + - open-vm-tools-desktop + - opensc + - openssh-clients + - openssh-server + - orca + - pam_afs_session + - paps + - passwdqc + - pciutils + - pinfo + - pipewire-alsa + - pipewire-gstreamer + - pipewire-pulseaudio + - pipewire-utils + - plocate + - plymouth + - plymouth-system-theme + - policycoreutils + - policycoreutils-python-utils + - prefixdevname + - procps-ng + - psmisc + - qcom-wwan-firmware + - qemu-guest-agent + - qt5-qtbase + - qt5-qtbase-gui + - qt5-qtdeclarative + - qt5-qtxmlpatterns + - quota + - realmd + - realtek-firmware + - rootfiles + - rpm + - rpm-ostree + - rsync + - samba-client + - selinux-policy-targeted + - setup + - shadow-utils + - sos + - speech-dispatcher + - spice-vdagent + - spice-webdavd + - sssd-common + - sssd-kcm + - sudo + - system-config-printer-udev + - systemd + - systemd-oomd-defaults + - systemd-resolved + - systemd-udev + - tar + - time + - tiwilink-firmware + - toolbox + - tree + - unzip + - uresourced + - usb_modeswitch + - usbutils + - util-linux + - vim-minimal + - wget2-wget + - which + - whois + - wireplumber + - words + - wpa_supplicant + - zip + - zram-generator-defaults +packages-x86_64: + - alsa-sof-firmware + - amd-ucode-firmware + - cirrus-audio-firmware + - intel-audio-firmware + - intel-vsc-firmware + - libva-intel-media-driver + - mcelog + - microcode_ctl + - thermald + - virtualbox-guest-additions +packages-aarch64: + - qcom-firmware + - qrtr + - rmtfs diff --git a/packages/cosmic-atomic.yaml b/packages/cosmic-atomic.yaml new file mode 100644 index 0000000..2c25ee2 --- /dev/null +++ b/packages/cosmic-atomic.yaml @@ -0,0 +1,18 @@ +# DO NOT EDIT! This content is generated from comps-sync.py +packages: + - ark + - cosmic-edit + - cosmic-files + - cosmic-player + - cosmic-session + - cosmic-store + - cosmic-term + - flatpak + - gnome-disk-utility + - gnome-keyring-pam + - gnome-system-monitor + - initial-setup-gui + - mesa-dri-drivers + - mesa-vulkan-drivers + - plymouth-system-theme + - toolbox diff --git a/packages/deepin-atomic.yaml b/packages/deepin-atomic.yaml new file mode 100644 index 0000000..8effca7 --- /dev/null +++ b/packages/deepin-atomic.yaml @@ -0,0 +1,32 @@ +# DO NOT EDIT! This content is generated from comps-sync.py +packages: + - chromium + - deepin-calculator + - deepin-calendar + - deepin-desktop + - deepin-editor + - deepin-file-manager + - deepin-icon-theme + - deepin-image-viewer + - deepin-picker + - deepin-screenshot + - deepin-system-monitor + - firewall-config + - glx-utils + - mesa-dri-drivers + - mesa-vulkan-drivers + - plymouth-system-theme + - 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/packages/kinoite-mobile.yaml b/packages/kinoite-mobile.yaml new file mode 100644 index 0000000..60b37ef --- /dev/null +++ b/packages/kinoite-mobile.yaml @@ -0,0 +1,32 @@ +# DO NOT EDIT! This content is generated from comps-sync.py +packages: + - angelfish + - arianna + - bluedevil + - elisa-player + - haruna + - kalk + - kasts + - kclock + - keysmith + - koko + - krecorder + - kweather + - marknote + - mesa-dri-drivers + - mesa-vulkan-drivers + - neochat + - okular-mobile + - plasma-discover + - plasma-discover-notifier + - plasma-mobile + - plasma-mobile-sounds + - plasma-settings + - plymouth-system-theme + - qmlkonsole + - qrca + - sddm + - sddm-themes + - sddm-wayland-plasma + - spacebar + - tokodon diff --git a/packages/kinoite.yaml b/packages/kinoite.yaml new file mode 100644 index 0000000..c41fd09 --- /dev/null +++ b/packages/kinoite.yaml @@ -0,0 +1,87 @@ +# DO NOT EDIT! This content is generated from comps-sync.py +packages: + - NetworkManager-config-connectivity-fedora + - akonadi-server + - akonadi-server-mysql + - ark + - audiocd-kio + - bluedevil + - breeze-icon-theme + - colord-kde + - dolphin + - ffmpegthumbs + - filelight + - firewall-config + - flatpak-kcm + - fprintd-pam + - kaccounts-integration-qt6 + - kaccounts-providers + - kcharselect + - kde-connect + - kde-gtk-config + - kde-inotify-survey + - kde-partitionmanager + - kde-settings-pulseaudio + - kdebugsettings + - kdegraphics-thumbnailers + - kdenetwork-filesharing + - kdeplasma-addons + - kdialog + - kdnssd + - kf6-baloo-file + - kfind + - khelpcenter + - kinfocenter + - kio-admin + - kio-gdrive + - kjournald + - kmenuedit + - konsole + - krdp + - krfb + - kscreen + - kscreenlocker + - kunifiedpush + - kwalletmanager5 + - kwin + - kwrite + - libappindicator-gtk3 + - mesa-dri-drivers + - mesa-vulkan-drivers + - pam-kwallet + - phonon-qt6-backend-vlc + - pinentry-qt + - plasma-breeze + - plasma-desktop + - plasma-desktop-doc + - plasma-discover + - plasma-discover-notifier + - plasma-disks + - plasma-drkonqi + - plasma-nm + - plasma-nm-openconnect + - plasma-nm-openvpn + - plasma-nm-vpnc + - plasma-pa + - plasma-print-manager + - plasma-systemmonitor + - plasma-thunderbolt + - plasma-vault + - plasma-welcome + - plasma-workspace + - plasma-workspace-wallpapers + - plymouth-system-theme + - polkit-kde + - samba-usershares + - sddm + - sddm-breeze + - sddm-kcm + - sddm-wayland-plasma + - signon-kwallet-extension + - spectacle + - systemd-oomd-defaults + - udisks2 + - vlc-plugin-gstreamer + - xwaylandvideobridge +packages-x86_64: + - thermald diff --git a/packages/lxqt-atomic.yaml b/packages/lxqt-atomic.yaml new file mode 100644 index 0000000..ef090ba --- /dev/null +++ b/packages/lxqt-atomic.yaml @@ -0,0 +1,39 @@ +# 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/packages/mate-atomic.yaml b/packages/mate-atomic.yaml new file mode 100644 index 0000000..4ccabe5 --- /dev/null +++ b/packages/mate-atomic.yaml @@ -0,0 +1,117 @@ +# 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-pptp-gnome + - 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/packages/silverblue.yaml b/packages/silverblue.yaml new file mode 100644 index 0000000..10f7459 --- /dev/null +++ b/packages/silverblue.yaml @@ -0,0 +1,60 @@ +# DO NOT EDIT! This content is generated from comps-sync.py +packages: + - ModemManager + - NetworkManager-adsl + - NetworkManager-openconnect-gnome + - NetworkManager-openvpn-gnome + - NetworkManager-ppp + - NetworkManager-pptp-gnome + - NetworkManager-ssh-gnome + - NetworkManager-vpnc-gnome + - NetworkManager-wwan + - adobe-source-code-pro-fonts + - avahi + - dconf + - fprintd-pam + - gdm + - glib-networking + - gnome-backgrounds + - gnome-bluetooth + - gnome-browser-connector + - gnome-classic-session + - gnome-color-manager + - gnome-control-center + - gnome-disk-utility + - gnome-epub-thumbnailer + - gnome-initial-setup + - gnome-remote-desktop + - gnome-session-wayland-session + - gnome-settings-daemon + - gnome-shell + - gnome-software + - gnome-system-monitor + - gnome-user-docs + - gnome-user-share + - gvfs-afc + - gvfs-afp + - gvfs-archive + - gvfs-fuse + - gvfs-goa + - gvfs-gphoto2 + - gvfs-mtp + - gvfs-smb + - librsvg2 + - libsane-hpaio + - localsearch + - mesa-dri-drivers + - mesa-libEGL + - mesa-vulkan-drivers + - nautilus + - plymouth-system-theme + - polkit + - ptyxis + - rygel + - systemd-oomd-defaults + - tinysparql + - xdg-desktop-portal + - xdg-desktop-portal-gnome + - xdg-desktop-portal-gtk + - xdg-user-dirs-gtk + - yelp diff --git a/packages/sway-atomic.yaml b/packages/sway-atomic.yaml new file mode 100644 index 0000000..0bab026 --- /dev/null +++ b/packages/sway-atomic.yaml @@ -0,0 +1,53 @@ +# DO NOT EDIT! This content is generated from comps-sync.py +packages: + - NetworkManager-l2tp-gnome + - NetworkManager-libreswan-gnome + - NetworkManager-openconnect-gnome + - NetworkManager-openvpn-gnome + - NetworkManager-pptp-gnome + - NetworkManager-sstp-gnome + - NetworkManager-vpnc-gnome + - Thunar + - blueman + - bolt + - dunst + - foot + - fprintd-pam + - gnome-keyring-pam + - gnome-themes-extra + - grim + - gvfs + - gvfs-smb + - imv + - kanshi + - lxqt-policykit + - mesa-dri-drivers + - mesa-vulkan-drivers + - network-manager-applet + - pavucontrol + - pinentry-gnome3 + - playerctl + - plymouth-system-theme + - polkit + - pulseaudio-utils + - sddm + - sddm-wayland-sway + - slurp + - sway + - sway-config-fedora + - swaybg + - swayidle + - swaylock + - system-config-printer + - thunar-archive-plugin + - tuned-ppd + - tuned-switcher + - waybar + - wev + - wl-clipboard + - wlr-randr + - wlsunset + - xarchiver + - xdg-desktop-portal-gtk + - xdg-desktop-portal-wlr + - xorg-x11-server-Xwayland diff --git a/packages/xfce-atomic.yaml b/packages/xfce-atomic.yaml new file mode 100644 index 0000000..9b01154 --- /dev/null +++ b/packages/xfce-atomic.yaml @@ -0,0 +1,93 @@ +# DO NOT EDIT! This content is generated from comps-sync.py +packages: + - NetworkManager-openconnect-gnome + - NetworkManager-openvpn-gnome + - NetworkManager-pptp-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/silverblue-common.yaml b/silverblue-common.yaml index f14023a..0835705 100644 --- a/silverblue-common.yaml +++ b/silverblue-common.yaml @@ -8,7 +8,7 @@ ref: fedora/42/${basearch}/silverblue include: - common.yaml - - silverblue-packages.yaml + - packages/silverblue.yaml packages: - fedora-release-silverblue diff --git a/silverblue-packages.yaml b/silverblue-packages.yaml deleted file mode 100644 index 10f7459..0000000 --- a/silverblue-packages.yaml +++ /dev/null @@ -1,60 +0,0 @@ -# DO NOT EDIT! This content is generated from comps-sync.py -packages: - - ModemManager - - NetworkManager-adsl - - NetworkManager-openconnect-gnome - - NetworkManager-openvpn-gnome - - NetworkManager-ppp - - NetworkManager-pptp-gnome - - NetworkManager-ssh-gnome - - NetworkManager-vpnc-gnome - - NetworkManager-wwan - - adobe-source-code-pro-fonts - - avahi - - dconf - - fprintd-pam - - gdm - - glib-networking - - gnome-backgrounds - - gnome-bluetooth - - gnome-browser-connector - - gnome-classic-session - - gnome-color-manager - - gnome-control-center - - gnome-disk-utility - - gnome-epub-thumbnailer - - gnome-initial-setup - - gnome-remote-desktop - - gnome-session-wayland-session - - gnome-settings-daemon - - gnome-shell - - gnome-software - - gnome-system-monitor - - gnome-user-docs - - gnome-user-share - - gvfs-afc - - gvfs-afp - - gvfs-archive - - gvfs-fuse - - gvfs-goa - - gvfs-gphoto2 - - gvfs-mtp - - gvfs-smb - - librsvg2 - - libsane-hpaio - - localsearch - - mesa-dri-drivers - - mesa-libEGL - - mesa-vulkan-drivers - - nautilus - - plymouth-system-theme - - polkit - - ptyxis - - rygel - - systemd-oomd-defaults - - tinysparql - - xdg-desktop-portal - - xdg-desktop-portal-gnome - - xdg-desktop-portal-gtk - - xdg-user-dirs-gtk - - yelp diff --git a/sway-atomic-common.yaml b/sway-atomic-common.yaml index 13ef6f0..34f57cc 100644 --- a/sway-atomic-common.yaml +++ b/sway-atomic-common.yaml @@ -8,7 +8,7 @@ ref: fedora/42/${basearch}/sericea include: - common.yaml - - sway-atomic-packages.yaml + - packages/sway-atomic.yaml packages: - fedora-release-sway-atomic diff --git a/sway-atomic-packages.yaml b/sway-atomic-packages.yaml deleted file mode 100644 index 0bab026..0000000 --- a/sway-atomic-packages.yaml +++ /dev/null @@ -1,53 +0,0 @@ -# DO NOT EDIT! This content is generated from comps-sync.py -packages: - - NetworkManager-l2tp-gnome - - NetworkManager-libreswan-gnome - - NetworkManager-openconnect-gnome - - NetworkManager-openvpn-gnome - - NetworkManager-pptp-gnome - - NetworkManager-sstp-gnome - - NetworkManager-vpnc-gnome - - Thunar - - blueman - - bolt - - dunst - - foot - - fprintd-pam - - gnome-keyring-pam - - gnome-themes-extra - - grim - - gvfs - - gvfs-smb - - imv - - kanshi - - lxqt-policykit - - mesa-dri-drivers - - mesa-vulkan-drivers - - network-manager-applet - - pavucontrol - - pinentry-gnome3 - - playerctl - - plymouth-system-theme - - polkit - - pulseaudio-utils - - sddm - - sddm-wayland-sway - - slurp - - sway - - sway-config-fedora - - swaybg - - swayidle - - swaylock - - system-config-printer - - thunar-archive-plugin - - tuned-ppd - - tuned-switcher - - waybar - - wev - - wl-clipboard - - wlr-randr - - wlsunset - - xarchiver - - xdg-desktop-portal-gtk - - xdg-desktop-portal-wlr - - xorg-x11-server-Xwayland diff --git a/xfce-atomic-packages.yaml b/xfce-atomic-packages.yaml deleted file mode 100644 index 9b01154..0000000 --- a/xfce-atomic-packages.yaml +++ /dev/null @@ -1,93 +0,0 @@ -# DO NOT EDIT! This content is generated from comps-sync.py -packages: - - NetworkManager-openconnect-gnome - - NetworkManager-openvpn-gnome - - NetworkManager-pptp-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 index 2e3e695..022f066 100644 --- a/xfce-atomic.yaml +++ b/xfce-atomic.yaml @@ -9,7 +9,7 @@ ref: fedora/42/${basearch}/xfce-atomic include: - common.yaml - - xfce-atomic-packages.yaml + - packages/xfce-atomic.yaml packages: - fedora-release-xfce From 6863d7c0b493963735dbcb1ef55bb19a248a5149 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Oct 25 2025 15:30:24 +0000 Subject: [PATCH 10/29] manifests: Split Fedora specific config into its own manifest This will make things easier for downstream builds which have to change the release and logo packages. --- diff --git a/budgie-atomic-common.yaml b/budgie-atomic-common.yaml index 4722e96..3fa853c 100644 --- a/budgie-atomic-common.yaml +++ b/budgie-atomic-common.yaml @@ -10,9 +10,6 @@ include: - common.yaml - packages/budgie-atomic.yaml -packages: - - fedora-release-budgie-atomic - # Make sure the following are not pulled in when Recommended by other packages exclude-packages: # Not needed in Budgie Desktop diff --git a/common.yaml b/common.yaml index cb1c54d..24b9d07 100644 --- a/common.yaml +++ b/common.yaml @@ -6,6 +6,8 @@ mutate-os-release: "${releasever}" variables: # Default to Bootable Containers and override in classic ostree manifests bootable_container: true + # Default to including Fedora branding and specific packages + distro: "fedora" # Exclude Perl by default and override for XFCE & LXQt exclude_perl: true @@ -34,6 +36,10 @@ arch-include: - qemu-user-static-non-x86_64.yaml conditional-include: + # Manifests included only if we are building for Fedora + - if: distro == "fedora" + include: + - fedora.yaml # Manifests included only for classic ostree variants - if: bootable_container == false include: @@ -75,9 +81,6 @@ packages: # Flatpak support - flatpak - xdg-desktop-portal - # Contains default ostree remote config to be used on client's - # system for fetching ostree update - - fedora-repos-ostree # the archive repo for more reliable package layering # https://github.com/coreos/fedora-coreos-tracker/issues/400 - fedora-repos-archive diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index 1a72bc6..bdae0ee 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -98,6 +98,14 @@ exclude_list: - qadwaitadecorations-qt5 # X11 specific - xorg-x11-drv-libinput + # Included explicitly in the fedora.yaml manifest + - fedora-chromium-config + - fedora-flathub-remote + - fedora-workstation-backgrounds + - fedora-workstation-repositories + firefox: + # Included explicitly in the fedora.yaml manifest + - fedora-bookmarks networkmanager-submodules: # Let's use the builtin one by default - dhcp-client @@ -161,6 +169,9 @@ desktop_exclude_list: - NetworkManager-libreswan-gnome - NetworkManager-sstp-gnome - NetworkManager-strongswan-gnome + # Included explicitly in the fedora.yaml manifest + - fedora-flathub-remote + - fedora-workstation-repositories budgie-desktop-apps: # Non-critical apps -> Flatpak - atril @@ -188,6 +199,9 @@ desktop_exclude_list: - toolbox # Already included by default for all variants - glibc-all-langpacks + # Included explicitly in the fedora.yaml manifest + - fedora-flathub-remote + - fedora-workstation-repositories kde-mobile: # Already included by default for all variants - glibc-all-langpacks @@ -270,6 +284,8 @@ desktop_exclude_list: - NetworkManager-team # Already in the common set - wireplumber + # Included explicitly in the fedora.yaml manifest + - fedora-release-matecompiz swaywm-extended: # Non-critical apps -> Flatpak - mpv diff --git a/cosmic-atomic-common.yaml b/cosmic-atomic-common.yaml index 1df421d..73b44a4 100644 --- a/cosmic-atomic-common.yaml +++ b/cosmic-atomic-common.yaml @@ -11,7 +11,6 @@ include: - packages/cosmic-atomic.yaml packages: - - fedora-release-cosmic-atomic # Portals for Flatpak - xdg-desktop-portal-gtk # Power management. Expected to be droped for tuned-ppd diff --git a/deepin-atomic.yaml b/deepin-atomic.yaml index f3e493d..9389448 100644 --- a/deepin-atomic.yaml +++ b/deepin-atomic.yaml @@ -11,9 +11,6 @@ include: - packages/deepin-atomic.yaml packages: - # Generic release package for desktop variants - - fedora-release - - fedora-release-ostree-desktop # GUI to manage updates & Flatpaks - gnome-software diff --git a/fedora.yaml b/fedora.yaml new file mode 100644 index 0000000..b9811f4 --- /dev/null +++ b/fedora.yaml @@ -0,0 +1,61 @@ +# All Fedora specific packages and configuration +packages: + - fedora-bookmarks + - fedora-chromium-config + - fedora-flathub-remote + - fedora-workstation-backgrounds + - fedora-workstation-repositories + # Contains default ostree remote config to be used on client's + # system for fetching ostree update + - fedora-repos-ostree + +# Fedora specific packages for each variant +conditional-include: + - if: variant == "silverblue" + include: + packages: + - fedora-release-silverblue + - if: variant == "kinoite" + include: + packages: + - fedora-release-kinoite + # Explicitely not included via comps + # See: https://pagure.io/fedora-kde/SIG/issue/295 + - plasma-welcome-fedora + - if: variant == "sway-atomic" + include: + packages: + - fedora-release-sway-atomic + - if: variant == "budgie-atomic" + include: + packages: + - fedora-release-budgie-atomic + - if: variant == "cosmic-atomic" + include: + packages: + - fedora-release-cosmic-atomic + - if: variant == "cinnamon-atomic" + include: + packages: + - fedora-release + - fedora-release-ostree-desktop + - if: variant == "deepin-atomic" + include: + packages: + - fedora-release + - fedora-release-ostree-desktop + - if: variant == "lxqt-atomic" + include: + packages: + - fedora-release + - fedora-release-ostree-desktop + - if: variant == "mate-atomic" + include: + packages: + - fedora-release-matecompiz + - fedora-release-ostree-desktop + - if: variant == "xfce-atomic" + include: + packages: + - fedora-release-xfce + - fedora-release-ostree-desktop diff --git a/kinoite-common.yaml b/kinoite-common.yaml index 1dc7929..d9c6257 100644 --- a/kinoite-common.yaml +++ b/kinoite-common.yaml @@ -20,7 +20,6 @@ conditional-include: - packages/kinoite-mobile.yaml packages: - - fedora-release-kinoite # Install some minor optional tools for KInfoCenter - vulkan-tools - xdpyinfo @@ -34,9 +33,6 @@ packages: - NetworkManager-ppp # Install gdb to make getting backtraces work with DrKonqi - gdb - # Explicitely not included via comps - # See: https://pagure.io/fedora-kde/SIG/issue/295 - - plasma-welcome-fedora # Make sure rpm-ostree support is installed - plasma-discover-rpm-ostree diff --git a/lxqt-atomic.yaml b/lxqt-atomic.yaml index 0270c1f..a05c697 100644 --- a/lxqt-atomic.yaml +++ b/lxqt-atomic.yaml @@ -12,9 +12,6 @@ include: - packages/lxqt-atomic.yaml packages: - # Generic release package for desktop variants - - fedora-release - - fedora-release-ostree-desktop - libqtxdg - kvantum - kwin-wayland diff --git a/mate-atomic.yaml b/mate-atomic.yaml index 05a1602..db34480 100644 --- a/mate-atomic.yaml +++ b/mate-atomic.yaml @@ -11,8 +11,6 @@ include: - packages/mate-atomic.yaml packages: - # Generic release sub package for desktop variants - - fedora-release-ostree-desktop # Portals for Flatpak - xdg-desktop-portal-gtk diff --git a/packages/common.yaml b/packages/common.yaml index b07fc61..603a532 100644 --- a/packages/common.yaml +++ b/packages/common.yaml @@ -56,11 +56,6 @@ packages: - e2fsprogs - ethtool - exfatprogs - - fedora-bookmarks - - fedora-chromium-config - - fedora-flathub-remote - - fedora-workstation-backgrounds - - fedora-workstation-repositories - file - filesystem - firefox diff --git a/packages/mate-atomic.yaml b/packages/mate-atomic.yaml index 4ccabe5..4f2c097 100644 --- a/packages/mate-atomic.yaml +++ b/packages/mate-atomic.yaml @@ -28,7 +28,6 @@ packages: - f38-backgrounds-extras-base - f38-backgrounds-extras-mate - f38-backgrounds-mate - - fedora-release-matecompiz - firefox - firewall-config - glx-utils diff --git a/silverblue-common.yaml b/silverblue-common.yaml index 0835705..5cbaf76 100644 --- a/silverblue-common.yaml +++ b/silverblue-common.yaml @@ -11,7 +11,6 @@ include: - packages/silverblue.yaml packages: - - fedora-release-silverblue - desktop-backgrounds-gnome - gnome-shell-extension-background-logo - pinentry-gnome3 diff --git a/sway-atomic-common.yaml b/sway-atomic-common.yaml index 34f57cc..96b5dd6 100644 --- a/sway-atomic-common.yaml +++ b/sway-atomic-common.yaml @@ -11,7 +11,6 @@ include: - packages/sway-atomic.yaml packages: - - fedora-release-sway-atomic # explicitly list some defaults - firefox diff --git a/xfce-atomic.yaml b/xfce-atomic.yaml index 022f066..ba633d4 100644 --- a/xfce-atomic.yaml +++ b/xfce-atomic.yaml @@ -12,9 +12,6 @@ include: - packages/xfce-atomic.yaml packages: - - fedora-release-xfce - # Generic release sub package for desktop variants - - fedora-release-ostree-desktop # Portals for Flatpak - xdg-desktop-portal-gtk From 44e945ba0d1521174c475b099061f55ca99b4685 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Oct 25 2025 15:30:27 +0000 Subject: [PATCH 11/29] ci: Minor Python lints fixes --- diff --git a/ci/validate b/ci/validate index c9e6a32..ab6b6f7 100755 --- a/ci/validate +++ b/ci/validate @@ -11,7 +11,7 @@ validated=0 def openat(dirfd, name, mode='r'): def opener(path, flags): return os.open(path, flags, dir_fd=dirfd) - return open(name, mode, opener=opener) + return open(name, mode, opener=opener, encoding='UTF-8') def validate_shell(rootfd, name): @@ -30,17 +30,18 @@ for root, dirs, files, rootfd in os.fwalk('.'): files.remove(f) for name in files: if name.endswith(('.yaml', '.yml')): - print("Validating:", name) - with open(os.open(name, dir_fd=rootfd, flags=os.O_RDONLY)) as f: + print("Validating:", os.path.join(root, name)) + with open(os.open(name, dir_fd=rootfd, flags=os.O_RDONLY), encoding='UTF-8') as f: yaml.safe_load(f) - result = subprocess.run(['grep', '-RniEv', '^( )*[a-z#/-]|^( )*\\[|^$|^#', name], encoding='UTF-8', + result = subprocess.run(['grep', '-RniEv', '^( )*[a-z#/-]|^( )*\\[|^$|^#', name], + encoding='UTF-8', preexec_fn=lambda: os.fchdir(rootfd)) if result.returncode == 0: raise Exception("Found likely invalid indentation in YAML file: {}".format(name)) validated +=1 continue - elif name.endswith('.sh'): - print("Validating:", name) + if name.endswith('.sh'): + print("Validating:", os.path.join(root, name)) validate_shell(rootfd, name) continue stbuf = os.lstat(name, dir_fd=rootfd) @@ -51,7 +52,7 @@ for root, dirs, files, rootfd in os.fwalk('.'): mimetype = subprocess.check_output(['file', '-b', '--mime-type', name], encoding='UTF-8', preexec_fn=lambda: os.fchdir(rootfd)).strip() if mimetype == 'text/x-shellscript': - print("Validating:", name) + print("Validating:", os.path.join(root, name)) validate_shell(rootfd, name) print(f"Validated {validated} files") From 5ac34acd822109bf77f9a3f94b1dbdaabe0e040e Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Oct 25 2025 15:30:27 +0000 Subject: [PATCH 12/29] justfile: Use 'just validate' in recipes --- diff --git a/justfile b/justfile index 35b8060..2645dc5 100644 --- a/justfile +++ b/justfile @@ -156,7 +156,7 @@ compose-legacy variant=default_variant: exit 1 fi - ./ci/validate > /dev/null || (echo "Failed manifest validation" && exit 1) + just validate > /dev/null || (echo "Failed manifest validation" && exit 1) mkdir -p repo cache logs if [[ ! -f "repo/config" ]]; then @@ -211,7 +211,7 @@ compose-image variant=default_variant: exit 1 fi - ./ci/validate > /dev/null || (echo "Failed manifest validation" && exit 1) + just validate > /dev/null || (echo "Failed manifest validation" && exit 1) mkdir -p repo cache if [[ ! -f "repo/config" ]]; then From 1b6fd2b4c27dbaa1fc08c97dc3777a58135eb679 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Oct 25 2025 15:30:27 +0000 Subject: [PATCH 13/29] fedora: Add case for kinoite-mobile variant Missed during the split in [1]. [1] a70ce6b manifests: Split Fedora specific config into its own manifest --- diff --git a/fedora.yaml b/fedora.yaml index b9811f4..d8a23d2 100644 --- a/fedora.yaml +++ b/fedora.yaml @@ -22,6 +22,13 @@ conditional-include: # Explicitely not included via comps # See: https://pagure.io/fedora-kde/SIG/issue/295 - plasma-welcome-fedora + - if: variant == "kinoite-mobile" + include: + packages: + - fedora-release-kinoite + # Explicitely not included via comps + # See: https://pagure.io/fedora-kde/SIG/issue/295 + - plasma-welcome-fedora - if: variant == "sway-atomic" include: packages: From bd4c306db135974612e522ad4f9a7d17335a0d59 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Oct 25 2025 15:30:27 +0000 Subject: [PATCH 14/29] common: Re-add explicit license info Initial dropped in [1], but better to be explicit. [1] fe766a8 manifests: Update metadata --- diff --git a/common.yaml b/common.yaml index 24b9d07..54e0c7b 100644 --- a/common.yaml +++ b/common.yaml @@ -3,6 +3,9 @@ releasever: 42 automatic-version-prefix: "${releasever}." mutate-os-release: "${releasever}" +metadata: + license: MIT + variables: # Default to Bootable Containers and override in classic ostree manifests bootable_container: true From 04d5e40970a897cc8f253f7cedc39cc460faecc2 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Oct 25 2025 15:30:27 +0000 Subject: [PATCH 15/29] manifests: Set ref using variables Remove duplication and a common soure of conflicts during backports. --- diff --git a/README.md b/README.md index 8add76a..aff2fbc 100644 --- a/README.md +++ b/README.md @@ -201,7 +201,7 @@ sed -i "s/42/43/g" README.md rm fedora-rawhide.repo sed -i --follow-symlinks "/- fedora-rawhide/d" *.yaml sed -i --follow-symlinks "s/# - fedora-42/- fedora-42/" *.yaml -sed -i --follow-symlinks "s/ref: fedora\/rawhide/ref: fedora\/42/" *.yaml +sed -i "s/releasever_ref: \"rawhide\"/releasever_ref: \"42\"/" common.yaml ``` ## Historical references diff --git a/base-atomic.yaml b/base-atomic.yaml index 4353c9c..5f569ce 100644 --- a/base-atomic.yaml +++ b/base-atomic.yaml @@ -4,8 +4,6 @@ metadata: variables: variant: "base-atomic" -ref: fedora/42/${basearch}/base-atomic - include: - common.yaml diff --git a/budgie-atomic-common.yaml b/budgie-atomic-common.yaml index 3fa853c..a6fd037 100644 --- a/budgie-atomic-common.yaml +++ b/budgie-atomic-common.yaml @@ -4,7 +4,8 @@ metadata: variables: variant: "budgie-atomic" -ref: fedora/42/${basearch}/onyx +# Overriden to keep the legacy name used in Fedora +ref: fedora/${releasever_ref}/${basearch}/onyx include: - common.yaml diff --git a/cinnamon-atomic.yaml b/cinnamon-atomic.yaml index e042bc6..5b5da31 100644 --- a/cinnamon-atomic.yaml +++ b/cinnamon-atomic.yaml @@ -4,8 +4,6 @@ metadata: variables: variant: "cinnamon-atomic" -ref: fedora/42/${basearch}/cinnamon-atomic - include: - common.yaml - packages/cinnamon-atomic.yaml diff --git a/common.yaml b/common.yaml index 54e0c7b..f62ab31 100644 --- a/common.yaml +++ b/common.yaml @@ -11,9 +11,14 @@ variables: bootable_container: true # Default to including Fedora branding and specific packages distro: "fedora" + # Used in ref. Equal to releasever, unless it's for Rawhide + releasever_ref: "42" # Exclude Perl by default and override for XFCE & LXQt exclude_perl: true +# Default ref, overriden for some variants with legacy names +ref: ${distro}/${releasever_ref}/${basearch}/${variant} + # Default to `bash` in our container, the same as other containers we ship. container-cmd: - /usr/bin/bash diff --git a/cosmic-atomic-common.yaml b/cosmic-atomic-common.yaml index 73b44a4..b011274 100644 --- a/cosmic-atomic-common.yaml +++ b/cosmic-atomic-common.yaml @@ -4,8 +4,6 @@ metadata: variables: variant: "cosmic-atomic" -ref: fedora/42/${basearch}/cosmic-atomic - include: - common.yaml - packages/cosmic-atomic.yaml diff --git a/deepin-atomic.yaml b/deepin-atomic.yaml index 9389448..66af7ce 100644 --- a/deepin-atomic.yaml +++ b/deepin-atomic.yaml @@ -4,8 +4,6 @@ metadata: variables: variant: "deepin-atomic" -ref: fedora/42/${basearch}/deepin-atomic - include: - common.yaml - packages/deepin-atomic.yaml diff --git a/kinoite-common.yaml b/kinoite-common.yaml index d9c6257..19ed790 100644 --- a/kinoite-common.yaml +++ b/kinoite-common.yaml @@ -5,9 +5,6 @@ metadata: variables: variant: "kinoite" -# Default to Kinoite (Desktop). Overriden in the Kinoite Mobile manifest -ref: fedora/42/${basearch}/kinoite - include: - common.yaml diff --git a/kinoite-mobile.yaml b/kinoite-mobile.yaml index 72b9ecc..14bc7f7 100644 --- a/kinoite-mobile.yaml +++ b/kinoite-mobile.yaml @@ -4,9 +4,6 @@ metadata: variables: variant: "kinoite-mobile" -# Override the default Kinoite ref from the kinoite-common.yaml manifest -ref: fedora/42/${basearch}/kinoite-mobile - include: - kinoite-common.yaml diff --git a/lxqt-atomic.yaml b/lxqt-atomic.yaml index a05c697..3c9201f 100644 --- a/lxqt-atomic.yaml +++ b/lxqt-atomic.yaml @@ -5,8 +5,6 @@ variables: variant: "lxqt-atomic" exclude_perl: false -ref: fedora/42/${basearch}/lazurite - include: - common.yaml - packages/lxqt-atomic.yaml diff --git a/mate-atomic.yaml b/mate-atomic.yaml index db34480..c0e5655 100644 --- a/mate-atomic.yaml +++ b/mate-atomic.yaml @@ -4,8 +4,6 @@ metadata: variables: variant: "mate-atomic" -ref: fedora/42/${basearch}/mate-atomic - include: - common.yaml - packages/mate-atomic.yaml diff --git a/silverblue-common.yaml b/silverblue-common.yaml index 5cbaf76..b5ac7f4 100644 --- a/silverblue-common.yaml +++ b/silverblue-common.yaml @@ -4,8 +4,6 @@ metadata: variables: variant: "silverblue" -ref: fedora/42/${basearch}/silverblue - include: - common.yaml - packages/silverblue.yaml diff --git a/sway-atomic-common.yaml b/sway-atomic-common.yaml index 96b5dd6..79bb0e8 100644 --- a/sway-atomic-common.yaml +++ b/sway-atomic-common.yaml @@ -4,7 +4,8 @@ metadata: variables: variant: "sway-atomic" -ref: fedora/42/${basearch}/sericea +# Overriden to keep the legacy name used in Fedora +ref: fedora/${releasever_ref}/${basearch}/sericea include: - common.yaml diff --git a/xfce-atomic.yaml b/xfce-atomic.yaml index ba633d4..e32f967 100644 --- a/xfce-atomic.yaml +++ b/xfce-atomic.yaml @@ -5,8 +5,6 @@ variables: variant: "xfce-atomic" exclude_perl: false -ref: fedora/42/${basearch}/xfce-atomic - include: - common.yaml - packages/xfce-atomic.yaml From e5597f167515d4e85cb7915c14e6310ea9b27ba6 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Oct 25 2025 15:30:27 +0000 Subject: [PATCH 16/29] fedora: Skip ostree repo config for Bootable Containers Ostree repo config is only needed on the classic ostree variants. --- diff --git a/fedora.yaml b/fedora.yaml index d8a23d2..290f155 100644 --- a/fedora.yaml +++ b/fedora.yaml @@ -5,9 +5,6 @@ packages: - fedora-flathub-remote - fedora-workstation-backgrounds - fedora-workstation-repositories - # Contains default ostree remote config to be used on client's - # system for fetching ostree update - - fedora-repos-ostree # Fedora specific packages for each variant conditional-include: @@ -66,3 +63,8 @@ conditional-include: packages: - fedora-release-xfce - fedora-release-ostree-desktop + # Include ostree remote configuration only on classic ostree variants + - if: bootable_container == false + include: + packages: + - fedora-repos-ostree From 2769ed5af5bdc65dd7b38cd98b7ecf5c273edbc9 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Oct 25 2025 15:30:27 +0000 Subject: [PATCH 17/29] manifests: Use plasma-discover for non-Silverblue variants GNOME Software currently hardcodes the name Silverblue in the code thus use Plasma Discover instead to manage updates. --- diff --git a/cinnamon-atomic.yaml b/cinnamon-atomic.yaml index 5b5da31..57ffd9a 100644 --- a/cinnamon-atomic.yaml +++ b/cinnamon-atomic.yaml @@ -12,7 +12,9 @@ packages: # Portals for Flatpak - xdg-desktop-portal-gtk # Include GUI to manage updates & Flatpaks - - gnome-software + - plasma-discover + - plasma-discover-notifier + - plasma-discover-rpm-ostree # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: diff --git a/deepin-atomic.yaml b/deepin-atomic.yaml index 66af7ce..3001131 100644 --- a/deepin-atomic.yaml +++ b/deepin-atomic.yaml @@ -10,7 +10,9 @@ include: packages: # GUI to manage updates & Flatpaks - - gnome-software + - plasma-discover + - plasma-discover-notifier + - plasma-discover-rpm-ostree # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: diff --git a/mate-atomic.yaml b/mate-atomic.yaml index c0e5655..3023ee3 100644 --- a/mate-atomic.yaml +++ b/mate-atomic.yaml @@ -9,6 +9,10 @@ include: - packages/mate-atomic.yaml packages: + # GUI to manage updates & Flatpaks + - plasma-discover + - plasma-discover-notifier + - plasma-discover-rpm-ostree # Portals for Flatpak - xdg-desktop-portal-gtk diff --git a/xfce-atomic.yaml b/xfce-atomic.yaml index e32f967..64b9539 100644 --- a/xfce-atomic.yaml +++ b/xfce-atomic.yaml @@ -10,6 +10,10 @@ include: - packages/xfce-atomic.yaml packages: + # GUI to manage updates & Flatpaks + - plasma-discover + - plasma-discover-notifier + - plasma-discover-rpm-ostree # Portals for Flatpak - xdg-desktop-portal-gtk From 186e80913f3238c3fcf817de04753144636889e1 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Oct 25 2025 15:30:27 +0000 Subject: [PATCH 18/29] manifests: Fix PackageKit-glib exclude Only exclude it for variants without GNOME Software. Fixes: a8f2e39 common: Always exclude PackageKit-glib --- diff --git a/common.yaml b/common.yaml index f62ab31..fd2f1b1 100644 --- a/common.yaml +++ b/common.yaml @@ -147,7 +147,6 @@ packages-x86_64: # Make sure the following are not pulled in when Recommended by other packages exclude-packages: - PackageKit - - PackageKit-glib # We can not include openh264. See https://fedoraproject.org/wiki/OpenH264 - gstreamer1-plugin-openh264 - mozilla-openh264 diff --git a/fedora.yaml b/fedora.yaml index 290f155..99abdcd 100644 --- a/fedora.yaml +++ b/fedora.yaml @@ -68,3 +68,8 @@ conditional-include: include: packages: - fedora-repos-ostree + # Can only be excluded on variants that do not include GNOME Software + - if: variant != "silverblue" + include: + exclude-packages: + - PackageKit-glib From 683f30dc690149df19ea901bd5308b931b9721a2 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Oct 25 2025 15:30:27 +0000 Subject: [PATCH 19/29] base-atomic: Move fedora-release package to fedora manifest --- diff --git a/base-atomic.yaml b/base-atomic.yaml index 5f569ce..32ef148 100644 --- a/base-atomic.yaml +++ b/base-atomic.yaml @@ -8,9 +8,6 @@ include: - common.yaml packages: - # Generic release package for desktop variants - - fedora-release - - fedora-release-ostree-desktop # XWayland support - xorg-x11-server-Xwayland # Portals for Flatpak diff --git a/fedora.yaml b/fedora.yaml index 99abdcd..04c21e8 100644 --- a/fedora.yaml +++ b/fedora.yaml @@ -63,6 +63,11 @@ conditional-include: packages: - fedora-release-xfce - fedora-release-ostree-desktop + - if: variant == "base-atomic" + include: + packages: + - fedora-release + - fedora-release-ostree-desktop # Include ostree remote configuration only on classic ostree variants - if: bootable_container == false include: From d89a5453b2231cc00a8dd3f88ce3aecd66452b82 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Oct 25 2025 15:30:27 +0000 Subject: [PATCH 20/29] kinoite: Re-split shared manifest to not depend on variant Variant names are Fedora specific, so we should not depend on those in shared manifests. Thus re-split the shared config into a shared manifests for Kinoite and Kinoite Mobile. --- diff --git a/kinoite-common.yaml b/kinoite-common.yaml index 19ed790..2d20d67 100644 --- a/kinoite-common.yaml +++ b/kinoite-common.yaml @@ -1,51 +1,10 @@ metadata: summary: "Fedora Kinoite" -# Default to Kinoite and override in Kinoite Mobile manifests variables: variant: "kinoite" include: + - kinoite-shared.yaml - common.yaml - -conditional-include: - - if: variant == "kinoite" - include: - - packages/kinoite.yaml - - if: variant == "kinoite-mobile" - include: - - packages/kinoite-mobile.yaml - -packages: - # Install some minor optional tools for KInfoCenter - - vulkan-tools - - xdpyinfo - # Includes a KIO & KCM (can not be Flatpak'ed), used by Dolphin and Gwenview - # See https://pagure.io/fedora-kde/SIG/issue/291 - - kamera - # Make sure that previous Anaconda dependencies are kept in the image - # See: https://pagure.io/fedora-kde/SIG/issue/243 - - mobile-broadband-provider-info - # Make sure that modem support is installed - - NetworkManager-ppp - # Install gdb to make getting backtraces work with DrKonqi - - gdb - # Make sure rpm-ostree support is installed - - plasma-discover-rpm-ostree - -# Make sure the following are not pulled in when Recommended by other packages -exclude-packages: - - plasma-discover-offline-updates - - plasma-discover-packagekit - - plasma-pk-updates - # Manually excluded as recommended by gtk3 (and likely gtk4 in the future) - # See https://pagure.io/fedora-kde/SIG/issue/124 - - tracker - - tracker-miners - - localsearch - - tinysparql - # Ensure we do not include X11 support - - plasma-x11 - - plasma-workspace-x11 - # Exclude mariadb server tools that bring in Perl - - mariadb-server-utils + - packages/kinoite.yaml diff --git a/kinoite-mobile-common.yaml b/kinoite-mobile-common.yaml new file mode 100644 index 0000000..a469b3c --- /dev/null +++ b/kinoite-mobile-common.yaml @@ -0,0 +1,10 @@ +metadata: + summary: "Fedora Kinoite Mobile" + +variables: + variant: "kinoite-mobile" + +include: + - kinoite-shared.yaml + - common.yaml + - packages/kinoite-mobile.yaml diff --git a/kinoite-mobile.yaml b/kinoite-mobile.yaml index 14bc7f7..1ec6e22 100644 --- a/kinoite-mobile.yaml +++ b/kinoite-mobile.yaml @@ -1,11 +1,5 @@ -metadata: - summary: "Fedora Kinoite Mobile" - -variables: - variant: "kinoite-mobile" - include: - - kinoite-common.yaml + - kinoite-mobile-common.yaml # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: diff --git a/kinoite-shared.yaml b/kinoite-shared.yaml new file mode 100644 index 0000000..6d7e900 --- /dev/null +++ b/kinoite-shared.yaml @@ -0,0 +1,35 @@ +# Shared manifest between Kinoite & Kinoite Mobile + +packages: + # Install some minor optional tools for KInfoCenter + - vulkan-tools + - xdpyinfo + # Includes a KIO & KCM (can not be Flatpak'ed), used by Dolphin and Gwenview + # See https://pagure.io/fedora-kde/SIG/issue/291 + - kamera + # Make sure that previous Anaconda dependencies are kept in the image + # See: https://pagure.io/fedora-kde/SIG/issue/243 + - mobile-broadband-provider-info + # Make sure that modem support is installed + - NetworkManager-ppp + # Install gdb to make getting backtraces work with DrKonqi + - gdb + # Make sure rpm-ostree support is installed + - plasma-discover-rpm-ostree + +# Make sure the following are not pulled in when Recommended by other packages +exclude-packages: + - plasma-discover-offline-updates + - plasma-discover-packagekit + - plasma-pk-updates + # Manually excluded as recommended by gtk3 (and likely gtk4 in the future) + # See https://pagure.io/fedora-kde/SIG/issue/124 + - tracker + - tracker-miners + - localsearch + - tinysparql + # Ensure we do not include X11 support + - plasma-x11 + - plasma-workspace-x11 + # Exclude mariadb server tools that bring in Perl + - mariadb-server-utils From 7f682ed34322496cd114152876532f2dec6c35d6 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Oct 25 2025 15:30:27 +0000 Subject: [PATCH 21/29] manifests: Move exclude to specific variants Keep exclude config in variants, not in the Fedora specific manifest. Fixes: a567407 manifests: Fix PackageKit-glib exclude --- diff --git a/base-atomic.yaml b/base-atomic.yaml index 32ef148..d727e4f 100644 --- a/base-atomic.yaml +++ b/base-atomic.yaml @@ -14,6 +14,10 @@ packages: - xdg-desktop-portal - xdg-desktop-portal-gtk +# Can only be excluded on variants that do not include GNOME Software +exclude-packages: + - PackageKit-glib + # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-42 diff --git a/budgie-atomic-common.yaml b/budgie-atomic-common.yaml index a6fd037..b0eee18 100644 --- a/budgie-atomic-common.yaml +++ b/budgie-atomic-common.yaml @@ -18,3 +18,5 @@ exclude-packages: - tracker-miners - localsearch - tinysparql + # Can only be excluded on variants that do not include GNOME Software + - PackageKit-glib diff --git a/cinnamon-atomic.yaml b/cinnamon-atomic.yaml index 57ffd9a..f61fdfe 100644 --- a/cinnamon-atomic.yaml +++ b/cinnamon-atomic.yaml @@ -16,6 +16,10 @@ packages: - plasma-discover-notifier - plasma-discover-rpm-ostree +exclude-packages: + # Can only be excluded on variants that do not include GNOME Software + - PackageKit-glib + # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-42 diff --git a/cosmic-atomic-common.yaml b/cosmic-atomic-common.yaml index b011274..13b70be 100644 --- a/cosmic-atomic-common.yaml +++ b/cosmic-atomic-common.yaml @@ -13,3 +13,7 @@ packages: - xdg-desktop-portal-gtk # Power management. Expected to be droped for tuned-ppd - power-profiles-daemon + +# Can only be excluded on variants that do not include GNOME Software +exclude-packages: + - PackageKit-glib diff --git a/deepin-atomic.yaml b/deepin-atomic.yaml index 3001131..3d3f4a4 100644 --- a/deepin-atomic.yaml +++ b/deepin-atomic.yaml @@ -14,6 +14,10 @@ packages: - plasma-discover-notifier - plasma-discover-rpm-ostree +exclude-packages: + # Can only be excluded on variants that do not include GNOME Software + - PackageKit-glib + # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-42 diff --git a/fedora.yaml b/fedora.yaml index 04c21e8..4612105 100644 --- a/fedora.yaml +++ b/fedora.yaml @@ -1,4 +1,9 @@ -# All Fedora specific packages and configuration +# Fedora specific packages and configuration + +# Note that this manifest must be additive only to allow downstream users to +# reuse the manifests in this project, excluding this one by setting the +# "distro" variable to their own value. + packages: - fedora-bookmarks - fedora-chromium-config @@ -73,8 +78,3 @@ conditional-include: include: packages: - fedora-repos-ostree - # Can only be excluded on variants that do not include GNOME Software - - if: variant != "silverblue" - include: - exclude-packages: - - PackageKit-glib diff --git a/kinoite-shared.yaml b/kinoite-shared.yaml index 6d7e900..957c0aa 100644 --- a/kinoite-shared.yaml +++ b/kinoite-shared.yaml @@ -33,3 +33,5 @@ exclude-packages: - plasma-workspace-x11 # Exclude mariadb server tools that bring in Perl - mariadb-server-utils + # Can only be excluded on variants that do not include GNOME Software + - PackageKit-glib diff --git a/lxqt-atomic.yaml b/lxqt-atomic.yaml index 3c9201f..06272f7 100644 --- a/lxqt-atomic.yaml +++ b/lxqt-atomic.yaml @@ -17,6 +17,10 @@ packages: # Portals for Flatpak - xdg-desktop-portal-kde +exclude-packages: + # Can only be excluded on variants that do not include GNOME Software + - PackageKit-glib + # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-42 diff --git a/mate-atomic.yaml b/mate-atomic.yaml index 3023ee3..7ceff51 100644 --- a/mate-atomic.yaml +++ b/mate-atomic.yaml @@ -18,6 +18,8 @@ packages: exclude-packages: - python3-unbound + # Can only be excluded on variants that do not include GNOME Software + - PackageKit-glib # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: diff --git a/sway-atomic-common.yaml b/sway-atomic-common.yaml index 79bb0e8..e74a882 100644 --- a/sway-atomic-common.yaml +++ b/sway-atomic-common.yaml @@ -21,3 +21,5 @@ exclude-packages: - tracker-miners - localsearch - tinysparql + # Can only be excluded on variants that do not include GNOME Software + - PackageKit-glib diff --git a/xfce-atomic.yaml b/xfce-atomic.yaml index 64b9539..54145b8 100644 --- a/xfce-atomic.yaml +++ b/xfce-atomic.yaml @@ -17,6 +17,10 @@ packages: # Portals for Flatpak - xdg-desktop-portal-gtk +exclude-packages: + # Can only be excluded on variants that do not include GNOME Software + - PackageKit-glib + # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: - fedora-42 From 1a5fd76c9d07c5afa490c839e8a3b956d374ad9d Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Oct 25 2025 15:30:27 +0000 Subject: [PATCH 22/29] comps-sync-exclude-list: Drop file-roller Has already been removed from comps a while ago. See: 61ff3046 gnome-desktop: Drop file-roller (fedora-comps) See: https://pagure.io/fedora-workstation/issue/167 --- diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index bdae0ee..dadaa25 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -128,8 +128,6 @@ desktop_exclude_list: - evince - evince-djvu - evince-nautilus - - file-roller - - file-roller-nautilus - gnome-boxes - gnome-calculator - gnome-calendar From b9a1b88abf4140081c1639bc94c1fb5882c1a7bf Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Oct 25 2025 15:30:27 +0000 Subject: [PATCH 23/29] silverblue: Move background & logo packages to fedora manifest - desktop-backgrounds-gnome: Fedora specific config to set the default wallpaper - gnome-shell-extension-background-logo: GNOME Shell extension to include the (Fedora) logo on top of the background --- diff --git a/fedora.yaml b/fedora.yaml index 4612105..2870272 100644 --- a/fedora.yaml +++ b/fedora.yaml @@ -17,6 +17,8 @@ conditional-include: include: packages: - fedora-release-silverblue + - desktop-backgrounds-gnome + - gnome-shell-extension-background-logo - if: variant == "kinoite" include: packages: diff --git a/silverblue-common.yaml b/silverblue-common.yaml index b5ac7f4..4acd573 100644 --- a/silverblue-common.yaml +++ b/silverblue-common.yaml @@ -9,8 +9,6 @@ include: - packages/silverblue.yaml packages: - - desktop-backgrounds-gnome - - gnome-shell-extension-background-logo - pinentry-gnome3 # Included for now to have layered Qt5 applications use a constistent style # Manually included here as it is excluded from the workstation-product group From 573bb48a2839b885b0f10e111362a3f13e8f5b0e Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Oct 25 2025 15:30:27 +0000 Subject: [PATCH 24/29] 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 dadaa25..f94dcb5 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 @@ -170,6 +171,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 @@ -177,6 +179,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 2870272..2096749 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 bc90d07..5e4c7ca 100644 --- a/packages/budgie-atomic.yaml +++ b/packages/budgie-atomic.yaml @@ -16,7 +16,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 603a532..71a4edd 100644 --- a/packages/common.yaml +++ b/packages/common.yaml @@ -58,7 +58,6 @@ packages: - exfatprogs - file - filesystem - - firefox - firewalld - fpaste - fros-gnome 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 10e1e8ada7c00b6e69f5d9da462ba93286a78cfc Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Oct 25 2025 15:30:27 +0000 Subject: [PATCH 25/29] 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 fd2f1b1..9c3f72e 100644 --- a/common.yaml +++ b/common.yaml @@ -113,6 +113,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 e3e69869f9ce885f345b91f71f18f874e62f2d57 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Nov 27 2025 22:35:09 +0000 Subject: [PATCH 26/29] budgie-atomic: Explicitly exclude GNOME Software See: https://pagure.io/fedora-budgie/project/issue/7 --- diff --git a/budgie-atomic-common.yaml b/budgie-atomic-common.yaml index b0eee18..276ba09 100644 --- a/budgie-atomic-common.yaml +++ b/budgie-atomic-common.yaml @@ -20,3 +20,5 @@ exclude-packages: - tinysparql # Can only be excluded on variants that do not include GNOME Software - PackageKit-glib + # Make sure GNOME Software does not get pulled as we use Plasma Discover + - gnome-software From 6da354c479ae73d80e8e1c713cf0b82f6469d8ec Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Nov 27 2025 22:35:09 +0000 Subject: [PATCH 27/29] 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 9c3f72e..dc9c991 100644 --- a/common.yaml +++ b/common.yaml @@ -95,10 +95,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 2096749..ce6979d 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 d592ed0daf32f48d4508349b802af1c93be96a9e Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Nov 27 2025 22:35:49 +0000 Subject: [PATCH 28/29] 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 f94dcb5..4e20f15 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -291,6 +291,8 @@ desktop_exclude_list: swaywm-extended: # Non-critical apps -> Flatpak - mpv + # Explicitly added in common.yaml + - git-core cinnamon-desktop: # Incompatible with ostree for various reasons - abrt-desktop From 4d6cb7f0f0ad18ff20fa5d6f08e1d884210d4cb8 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Nov 27 2025 22:36:39 +0000 Subject: [PATCH 29/29] 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 4e20f15..d10fb89 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 + # Included explicitly in the fedora.yaml manifest + - toolbox firefox: # Included explicitly in the fedora.yaml manifest - fedora-bookmarks @@ -328,6 +330,9 @@ desktop_exclude_list: - NetworkManager-sstp-gnome - NetworkManager-strongswan-gnome - NetworkManager-team + 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 ce6979d..91c64dd 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 71a4edd..73cb92f 100644 --- a/packages/common.yaml +++ b/packages/common.yaml @@ -170,7 +170,6 @@ packages: - tar - time - tiwilink-firmware - - toolbox - tree - unzip - uresourced diff --git a/packages/cosmic-atomic.yaml b/packages/cosmic-atomic.yaml index 2c25ee2..339fbcc 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