PR#578: Add initial COSMIC Atomic variant - workstation-ostree-config

workstation-ostree-config

#578 Add initial COSMIC Atomic variant

Merged 3 months ago by siosm. Opened 3 months ago by siosm.

siosm/workstation-ostree-config main-cosmic into main

Timothée Ravier • 3 months ago

47a03b4

.gitlab-ci.yml

file modified

		`@@ -27,3 +27,4 @@`
		`- lxqt-atomic`
		`- budgie-atomic`
		`- base-atomic`
		`+ - cosmic-atomic`

comps-sync-exclude-list.yml

file modified

+10

		`@@ -306,3 +306,13 @@`
		`- NetworkManager-sstp-gnome`
		`- NetworkManager-strongswan-gnome`
		`- NetworkManager-team`
		`+ cosmic-desktop:`
		`+ # Pulls PackageKit in`
		`+ - cosmic-store`
		`+ cosmic-desktop-apps:`
		`+ # Non-critical apps -> Flatpak`
		`+ - gnome-calculator`
		`+ - nheko`
		`+ - okular`
		`+ - rhythmbox`
		`+ - thunderbird`

comps-sync.py

file modified

		`@@ -195,6 +195,7 @@`
		`variant_comps_groups = {`
		`"budgie-atomic": ["budgie-desktop", "budgie-desktop-apps", "base-x"],`
		`"cinnamon-atomic": ["cinnamon-desktop", "base-x"],`
		`+ "cosmic-atomic": ["cosmic-desktop", "cosmic-desktop-apps", "base-graphical"],`
		`"deepin-atomic": ["deepin-desktop", "base-x"],`
		`"kinoite": ["kde-desktop", "base-graphical"],`
		`"kinoite-mobile": ["kde-mobile", "kde-mobile-apps", "base-graphical"],`

cosmic-atomic-packages.yaml

file added

+13

		`@@ -0,0 +1,13 @@`
		`+ # DO NOT EDIT! This content is generated from comps-sync.py`
		`+ packages:`
		`+ - ark`
		`+ - cosmic-edit`
		`+ - cosmic-files`
		`+ - cosmic-session`
		`+ - cosmic-term`
		`+ - gnome-disk-utility`
		`+ - gnome-keyring`
		`+ - gnome-system-monitor`
		`+ - mesa-dri-drivers`
		`+ - mesa-vulkan-drivers`
		`+ - plymouth-system-theme`

cosmic-atomic.yaml

file added

+25

		`@@ -0,0 +1,25 @@`
		`+ variables:`
		`+ bootable_container: true`
		`+ variant: "cosmic-atomic"`
		`+`
		`+ include:`
		`+ - common.yaml`
		`+ - cosmic-atomic-packages.yaml`
		`+`
		`+ ref: fedora/rawhide/${basearch}/cosmic-atomic`
		`+ rojig:`
		`+ name: fedora-cosmic`
		`+ summary: "Fedora COSMIC Atomic"`
		`+ license: MIT`
		`+`
		`+ packages:`
		`+ # Portals for Flatpak`
		`+ - xdg-desktop-portal-gtk`
		`+ # Include GUI to manage updates & Flatpaks`
		`+ - gnome-software`
		`+`
		`+ # Kept in the leaf manifest as they are overwritten by Pungi in composes`
		`+ repos:`
		`+ - fedora-rawhide`
		`+ # - fedora-42`
		`+ # - fedora-42-updates`

justfile

file modified

		`@@ -19,6 +19,7 @@`
		`[xfce-atomic]="XFCE Atomic"`
		`[lxqt-atomic]="LXQt Atomic"`
		`[base-atomic]="Base Atomic"`
		`+ [cosmic-atomic]="COSMIC Atomic"`
		`)'`

		`# Legacy names, used to keep some references stable`
		`@@ -42,6 +43,7 @@`
		`[xfce-atomic]="XfA"`
		`[lxqt-atomic]="LxA"`
		`[base-atomic]="BsA"`
		`+ [cosmic-atomic]="CMC"`
		`)'`

		`# Default is to only validate the manifests`

siosm commented 3 months ago

See: https://pagure.io/fedora-comps/pull-request/1031

siosm commented 3 months ago

From https://gitlab.com/fedora/ostree/ci-test/-/jobs/8026634340:

 Problem: package cosmic-store-1.0.0~alpha.2-1.fc42.x86_64 from fedora-rawhide requires PackageKit, but none of the providers can be installed
  - conflicting requests
  - package PackageKit-1.2.8-7.fc41.x86_64 from fedora-rawhide is filtered out by exclude filtering

https://src.fedoraproject.org/rpms/cosmic-store/blob/rawhide/f/cosmic-store.spec#_40

Edited 3 months ago by siosm

4 new commits added