PR#705: [f42] Backport manifests cleanups and fixes - workstation-ostree-config

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

LICENSES/MIT.txt

file added

+18

		`@@ -0,0 +1,18 @@`
		`+ MIT License`
		`+`
		`+ Copyright (c) <year> <copyright holders>`
		`+`
		`+ 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.`

README.md

file modified

+1 -1

		`@@ -201,7 +201,7 @@`
		`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`

REUSE.toml

file added

+18

		`@@ -0,0 +1,18 @@`
		`+ version = 1`
		`+`
		`+ [[annotations]]`
		`+ path = [`
		`+ "*.repo",`
		`+ "*.yaml",`
		`+ "packages/*.yaml",`
		`+ ".gitignore",`
		`+ "README.md",`
		`+ "ci/*",`
		`+ "comps-sync-exclude-list.yml",`
		`+ "group",`
		`+ "passwd",`
		`+ ]`
		`+ SPDX-FileCopyrightText = [`
		`+ "Fedora Atomic Desktops maintainers",`
		`+ ]`
		`+ SPDX-License-Identifier = "MIT"`

base-atomic.yaml

file modified

+7 -9

		`@@ -1,25 +1,23 @@`
		`+ metadata:`
		`+ summary: "Fedora Base Atomic"`
		`+`
		`variables:`
		`variant: "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`
		`- - fedora-release-ostree-desktop`
		`# XWayland support`
		`- xorg-x11-server-Xwayland`
		`# Portals for Flatpak`
		`- 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`

bootc.yaml

file removed

-4

		`@@ -1,4 +0,0 @@`
		`- # Add bootc for Bootable Container images`
		`- # See: https://fedoraproject.org/wiki/Changes/DNFAndBootcInImageModeFedora`
		`- packages:`
		`- - bootc`

budgie-atomic-common.yaml

file modified

+11 -14

		`@@ -1,20 +1,15 @@`
		`+ metadata:`
		`+ summary: "Fedora Budgie Atomic"`
		`+`
		`variables:`
		`variant: "budgie-atomic"`

		`+ # Overriden to keep the legacy name used in Fedora`
		`+ ref: fedora/${releasever_ref}/${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`
		`- - gnome-software-rpm-ostree`
		`+ - packages/budgie-atomic.yaml`

		`# Make sure the following are not pulled in when Recommended by other packages`
		`exclude-packages:`
		`@@ -23,5 +18,7 @@`
		`- tracker-miners`
		`- localsearch`
		`- tinysparql`
		`- # Exclude GNOME Software's langpack plugin to avoid layering langpacks on Silverblue`
		`- - gnome-software-fedora-langpacks`
		`+ # 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`

ci/validate

file modified

+8 -7

		`@@ -11,7 +11,7 @@`
		`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 @@`
		`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 @@`
		`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")`

cinnamon-atomic.yaml

file modified

+11 -8

		`@@ -1,21 +1,24 @@`
		`+ metadata:`
		`+ summary: "Fedora Cinnamon Atomic"`
		`+`
		`variables:`
		`variant: "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/cinnamon-atomic.yaml`

		`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`
		`+`
		`+ 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:`

common.yaml

file modified

+21 -11

		`@@ -1,20 +1,31 @@`
		`+ edition: "2024"`
		`releasever: 42`
		`automatic-version-prefix: "${releasever}.<date:%Y%m%d>"`
		`mutate-os-release: "${releasever}"`

		`+ metadata:`
		`+ license: MIT`
		`+`
		`variables:`
		`# Default to Bootable Containers and override in classic ostree manifests`
		`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`

		`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`
		`@@ -33,6 +44,10 @@`
		`- 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:`
		`@@ -40,7 +55,6 @@`
		`# Manifests included only for the Bootable Container variants`
		`- if: bootable_container == true`
		`include:`
		`- - bootc.yaml`
		`- dnf5.yaml`
		`- if: exclude_perl == true`
		`include:`
		`@@ -75,19 +89,12 @@`
		`# 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`
		`# 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`
		`@@ -102,13 +109,13 @@`
		`- printer-driver-brlaser`
		`- ptouch-driver`
		`- splix`
		`+ # See: https://github.com/fedora-silverblue/issue-tracker/issues/390`
		`+ - wireguard-tools`

		`selinux: true`
		`documentation: true`
		`- boot-location: modules`
		`etc-group-members:`
		`- wheel`
		`- tmp-is-dir: true`

		`ignore-removed-users:`
		`- root`
		`@@ -157,6 +164,9 @@`
		`- 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:`
		`- \|`

comps-sync-exclude-list.yml

file modified

+27 -2

		`@@ -98,6 +98,17 @@`
		`- 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`
		`+ # Included explicitly in the fedora.yaml manifest`
		`+ - toolbox`
		`+ firefox:`
		`+ # Included explicitly in the fedora.yaml manifest`
		`+ - fedora-bookmarks`
		`+ - firefox`
		`networkmanager-submodules:`
		`# Let's use the builtin one by default`
		`- dhcp-client`
		`@@ -120,8 +131,6 @@`
		`- evince`
		`- evince-djvu`
		`- evince-nautilus`
		`- - file-roller`
		`- - file-roller-nautilus`
		`- gnome-boxes`
		`- gnome-calculator`
		`- gnome-calendar`
		`@@ -161,6 +170,10 @@`
		`- NetworkManager-libreswan-gnome`
		`- NetworkManager-sstp-gnome`
		`- NetworkManager-strongswan-gnome`
		`+ # Included explicitly in the fedora.yaml manifest`
		`+ - fedora-flathub-remote`
		`+ - fedora-workstation-repositories`
		`+ - firefox`
		`budgie-desktop-apps:`
		`# Non-critical apps -> Flatpak`
		`- atril`
		`@@ -168,6 +181,8 @@`
		`- gnome-calculator`
		`- parole`
		`- rhythmbox`
		`+ # Included explicitly in the fedora.yaml manifest`
		`+ - firefox`
		`kde-desktop:`
		`# Incompatible with ostree for various reasons`
		`- abrt-desktop`
		`@@ -188,6 +203,9 @@`
		`- 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,9 +288,13 @@`
		`- 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`
		`+ # Explicitly added in common.yaml`
		`+ - git-core`
		`cinnamon-desktop:`
		`# Incompatible with ostree for various reasons`
		`- abrt-desktop`
		`@@ -308,6 +330,9 @@`
		`- 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`

comps-sync.py

file modified

+5 -2

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

		`@@ -189,7 +192,7 @@`
		`# 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 = {`
		`@@ -209,7 +212,7 @@`
		`# 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)`

cosmic-atomic-common.yaml

file modified

+8 -8

		`@@ -1,19 +1,19 @@`
		`+ metadata:`
		`+ summary: "Fedora COSMIC Atomic"`
		`+`
		`variables:`
		`variant: "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/cosmic-atomic.yaml`

		`packages:`
		`- - fedora-release-cosmic-atomic`
		`# Portals for Flatpak`
		`- 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`

deepin-atomic.yaml

file modified

+11 -11

		`@@ -1,22 +1,22 @@`
		`+ metadata:`
		`+ summary: "Fedora Deepin Atomic"`
		`+`
		`variables:`
		`variant: "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/deepin-atomic.yaml`

		`packages:`
		`- # Generic release package for desktop variants`
		`- - fedora-release`
		`- - fedora-release-ostree-desktop`
		`# GUI to manage updates & Flatpaks`
		`- - gnome-software`
		`+ - plasma-discover`
		`+ - 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.yaml

file added

+91

		`@@ -0,0 +1,91 @@`
		`+ # 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`
		`+ - 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`
		`+ # Kept for backward compatibility for AppImages`
		`+ # 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:`
		`+ - if: variant == "silverblue"`
		`+ include:`
		`+ packages:`
		`+ - fedora-release-silverblue`
		`+ - desktop-backgrounds-gnome`
		`+ - gnome-shell-extension-background-logo`
		`+ - 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 == "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:`
		`+ - 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`
		`+ - 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:`
		`+ packages:`
		`+ - fedora-repos-ostree`

generate-gitlab-ci.sh

file modified

		`@@ -1,4 +1,6 @@`
		`#!/bin/bash`
		`+`
		`+ # SPDX-FileCopyrightText: Fedora Atomic Desktops maintainers`
		`# SPDX-License-Identifier: MIT`

		`set -euo pipefail`
		`@@ -26,6 +28,7 @@`

		`{`
		`cat <<EOF`
		`+ # SPDX-FileCopyrightText: Fedora Atomic Desktops maintainers`
		`# SPDX-License-Identifier: MIT`

		`# Only used in https://gitlab.com/fedora/ostree/ci-test`

justfile

file modified

+5 -2

		`@@ -1,3 +1,6 @@`
		`+ # SPDX-FileCopyrightText: Fedora Atomic Desktops maintainers`
		`+ # SPDX-License-Identifier: MIT`
		`+`
		`# This is a justfile. See https://github.com/casey/just`
		`# This is only used for local development. The builds made on the Fedora`
		`# infrastructure are run via Pungi in a Koji runroot.`
		`@@ -153,7 +156,7 @@`
		`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`
		`@@ -208,7 +211,7 @@`
		`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`

kinoite-common.yaml

file modified

+6 -55

		`@@ -1,59 +1,10 @@`
		`- include:`
		`- - common.yaml`
		`+ metadata:`
		`+ summary: "Fedora Kinoite"`

		`- # Default to Kinoite and override in Kinoite Mobile manifests`
		`variables:`
		`variant: "kinoite"`

		`- conditional-include:`
		`- - if: variant == "kinoite"`
		`- include:`
		`- - kinoite-packages.yaml`
		`- - if: variant == "kinoite-mobile"`
		`- 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`
		`- - 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`
		`- # 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`
		`-`
		`- # 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`
		`+ include:`
		`+ - kinoite-shared.yaml`
		`+ - common.yaml`
		`+ - packages/kinoite.yaml`

kinoite-mobile-common.yaml

file added

+10

		`@@ -0,0 +1,10 @@`
		`+ metadata:`
		`+ summary: "Fedora Kinoite Mobile"`
		`+`
		`+ variables:`
		`+ variant: "kinoite-mobile"`
		`+`
		`+ include:`
		`+ - kinoite-shared.yaml`
		`+ - common.yaml`
		`+ - packages/kinoite-mobile.yaml`

kinoite-mobile.yaml

file modified

+1 -11

		`@@ -1,15 +1,5 @@`
		`- 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`
		`+ - kinoite-mobile-common.yaml`

		`# Kept in the leaf manifest as they are overwritten by Pungi in composes`
		`repos:`

kinoite-shared.yaml

file added

+37

		`@@ -0,0 +1,37 @@`
		`+ # 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`
		`+ # Can only be excluded on variants that do not include GNOME Software`
		`+ - PackageKit-glib`

lxqt-atomic.yaml

file modified

+8 -10

		`@@ -1,21 +1,15 @@`
		`+ metadata:`
		`+ summary: "Fedora LXQt Atomic"`
		`+`
		`variables:`
		`variant: "lxqt-atomic"`
		`exclude_perl: false`

		`include:`
		`- common.yaml`
		`- - lxqt-atomic-packages.yaml`
		`-`
		`- ref: fedora/42/${basearch}/lazurite`
		`- rojig:`
		`- name: fedora-lxqt`
		`- summary: "Fedora LXQt Atomic"`
		`- license: MIT`
		`+ - packages/lxqt-atomic.yaml`

		`packages:`
		`- # Generic release package for desktop variants`
		`- - fedora-release`
		`- - fedora-release-ostree-desktop`
		`- libqtxdg`
		`- kvantum`
		`- kwin-wayland`
		`@@ -23,6 +17,10 @@`
		`# 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`

mate-atomic.yaml

file modified

+10 -9

		`@@ -1,24 +1,25 @@`
		`+ metadata:`
		`+ summary: "Fedora Mate Atomic"`
		`+`
		`variables:`
		`variant: "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/mate-atomic.yaml`

		`packages:`
		`- # Generic release sub package for desktop variants`
		`- - fedora-release-ostree-desktop`
		`+ # GUI to manage updates & Flatpaks`
		`+ - plasma-discover`
		`+ - plasma-discover-notifier`
		`+ - plasma-discover-rpm-ostree`
		`# Portals for Flatpak`
		`- xdg-desktop-portal-gtk`

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

packages/budgie-atomic.yaml ~~budgie-atomic-packages.yaml~~

file renamed

-1

		`@@ -16,7 +16,6 @@`
		`- budgie-desktop-view`
		`- budgie-screensaver`
		`- dconf`
		`- - firefox`
		`- fprintd-pam`
		`- gedit`
		`- glib-networking`

packages/cinnamon-atomic.yaml ~~cinnamon-atomic-packages.yaml~~

file renamed

file was moved with no change to the file

packages/common.yaml ~~common-packages.yaml~~

file renamed

-7

		`@@ -56,14 +56,8 @@`
		`- e2fsprogs`
		`- ethtool`
		`- exfatprogs`
		`- - fedora-bookmarks`
		`- - fedora-chromium-config`
		`- - fedora-flathub-remote`
		`- - fedora-workstation-backgrounds`
		`- - fedora-workstation-repositories`
		`- file`
		`- filesystem`
		`- - firefox`
		`- firewalld`
		`- fpaste`
		`- fros-gnome`
		`@@ -176,7 +170,6 @@`
		`- tar`
		`- time`
		`- tiwilink-firmware`
		`- - toolbox`
		`- tree`
		`- unzip`
		`- uresourced`

packages/cosmic-atomic.yaml ~~cosmic-atomic-packages.yaml~~

file renamed

-1

		`@@ -15,4 +15,3 @@`
		`- mesa-dri-drivers`
		`- mesa-vulkan-drivers`
		`- plymouth-system-theme`
		`- - toolbox`

packages/deepin-atomic.yaml ~~deepin-atomic-packages.yaml~~

file renamed

file was moved with no change to the file

packages/kinoite-mobile.yaml ~~kinoite-mobile-packages.yaml~~

file renamed

file was moved with no change to the file

packages/kinoite.yaml ~~kinoite-packages.yaml~~

file renamed

file was moved with no change to the file

packages/lxqt-atomic.yaml ~~lxqt-atomic-packages.yaml~~

file renamed

file was moved with no change to the file

packages/mate-atomic.yaml ~~mate-atomic-packages.yaml~~

file renamed

-1

		`@@ -28,7 +28,6 @@`
		`- f38-backgrounds-extras-base`
		`- f38-backgrounds-extras-mate`
		`- f38-backgrounds-mate`
		`- - fedora-release-matecompiz`
		`- firefox`
		`- firewall-config`
		`- glx-utils`

packages/silverblue.yaml ~~silverblue-packages.yaml~~

file renamed

file was moved with no change to the file

packages/sway-atomic.yaml ~~sway-atomic-packages.yaml~~

file renamed

file was moved with no change to the file

packages/xfce-atomic.yaml ~~xfce-atomic-packages.yaml~~

file renamed

file was moved with no change to the file

silverblue-common.yaml

file modified

+7 -15

		`@@ -1,20 +1,14 @@`
		`+ metadata:`
		`+ summary: "Fedora Silverblue"`
		`+`
		`variables:`
		`variant: "silverblue"`

		`include:`
		`- common.yaml`
		`- - silverblue-packages.yaml`
		`-`
		`- ref: fedora/42/${basearch}/silverblue`
		`- rojig:`
		`- name: fedora-silverblue`
		`- summary: "Fedora Silverblue"`
		`- license: MIT`
		`+ - packages/silverblue.yaml`

		`packages:`
		`- - fedora-release-silverblue`
		`- - 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`
		`@@ -30,8 +24,6 @@`
		`- totem-video-thumbnailer`
		`# 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:`
		`- # Exclude GNOME Software's langpack plugin to avoid layering langpacks on Silverblue`
		`- - gnome-software-fedora-langpacks`
		`+ # Needed for GSConnect extension`
		`+ # See: https://github.com/fedora-silverblue/issue-tracker/issues/201`
		`+ - openssl`

sway-atomic-common.yaml

file modified

+9 -15

		`@@ -1,27 +1,21 @@`
		`+ metadata:`
		`+ summary: "Fedora Sway Atomic"`
		`+`
		`variables:`
		`variant: "sway-atomic"`

		`+ # Overriden to keep the legacy name used in Fedora`
		`+ ref: fedora/${releasever_ref}/${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`
		`- - firefox`
		`+ - packages/sway-atomic.yaml`

		`exclude-packages:`
		`- # already excluded in comps-sync-exclude-list`
		`- - PackageKit-glib`
		`- - grubby`
		`# nothing in the tree would use these`
		`- tracker`
		`- tracker-miners`
		`- localsearch`
		`- tinysparql`
		`+ # Can only be excluded on variants that do not include GNOME Software`
		`+ - PackageKit-glib`

xfce-atomic.yaml

file modified

+12 -10

		`@@ -1,24 +1,26 @@`
		`+ metadata:`
		`+ summary: "Fedora XFCE Atomic"`
		`+`
		`variables:`
		`variant: "xfce-atomic"`
		`exclude_perl: false`

		`include:`
		`- common.yaml`
		`- - xfce-atomic-packages.yaml`
		`-`
		`- ref: fedora/42/${basearch}/vauxite`
		`- rojig:`
		`- name: fedora-vauxite`
		`- summary: "Fedora XFCE Atomic"`
		`- license: MIT`
		`+ - packages/xfce-atomic.yaml`

		`packages:`
		`- - fedora-release-xfce`
		`- # Generic release sub package for desktop variants`
		`- - fedora-release-ostree-desktop`
		`+ # GUI to manage updates & Flatpaks`
		`+ - plasma-discover`
		`+ - plasma-discover-notifier`
		`+ - plasma-discover-rpm-ostree`
		`# 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`