From 3f0ac08377a2e7c3d702f806d4614fa9cf340a19 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 10 2025 05:33:08 +0000 Subject: [PATCH 1/5] Modify cosmic-atomic to match the other atomic .yaml structures This is needed for https://pagure.io/fedora-infra/ansible/pull-request/2502 Signed-off-by: Ryan Brue --- diff --git a/cosmic-atomic-common.yaml b/cosmic-atomic-common.yaml new file mode 100644 index 0000000..40c485b --- /dev/null +++ b/cosmic-atomic-common.yaml @@ -0,0 +1,29 @@ +variables: + 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: + # Generic release package for desktop variants + - fedora-release + - fedora-release-ostree-desktop + # Portals for Flatpak + - xdg-desktop-portal-gtk + # Include GUI to manage updates & Flatpaks + - gnome-software + # Power management. Expected to be droped for tuned-ppd + - power-profiles-daemon + +# Kept in the leaf manifest as they are overwritten by Pungi in composes +repos: + - fedora-rawhide + # - fedora-43 + # - fedora-43-updates diff --git a/cosmic-atomic-ostree.yaml b/cosmic-atomic-ostree.yaml new file mode 100644 index 0000000..fdf4d48 --- /dev/null +++ b/cosmic-atomic-ostree.yaml @@ -0,0 +1,11 @@ +variables: + bootable_container: false + +include: + - cosmic-atomic-common.yaml + +# Kept in the leaf manifest as they are overwritten by Pungi in composes +repos: + - fedora-rawhide + # - fedora-43 + # - fedora-43-updates diff --git a/cosmic-atomic.yaml b/cosmic-atomic.yaml index 40c485b..fe5f195 100644 --- a/cosmic-atomic.yaml +++ b/cosmic-atomic.yaml @@ -1,26 +1,5 @@ -variables: - 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: - # Generic release package for desktop variants - - fedora-release - - fedora-release-ostree-desktop - # Portals for Flatpak - - xdg-desktop-portal-gtk - # Include GUI to manage updates & Flatpaks - - gnome-software - # Power management. Expected to be droped for tuned-ppd - - power-profiles-daemon + - cosmic-atomic-common.yaml # Kept in the leaf manifest as they are overwritten by Pungi in composes repos: From 8e31500f134769d88a8770bf0caa744989568ee5 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 10 2025 18:47:52 +0000 Subject: [PATCH 2/5] Change volume substitution for COSMIC to match pungi https://pagure.io/pungi-fedora/pull-request/1458# Signed-off-by: Ryan Brue --- diff --git a/justfile b/justfile index 9ae7ed0..3a4fdad 100644 --- a/justfile +++ b/justfile @@ -34,7 +34,7 @@ volume_id_substitutions := '( [xfce-atomic]="XfA" [lxqt-atomic]="LxA" [base-atomic]="BsA" - [cosmic-atomic]="CMC" + [cosmic-atomic]="CSMCA" )' # Default is to only validate the manifests From d9281c0dd9a74ae27b1ae6a8634aa88d0b8c9528 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 10 2025 21:18:50 +0000 Subject: [PATCH 3/5] cosmic: Remove gnome-software COSMIC store supports flatpak, so let's use COSMIC store Signed-off-by: Ryan Brue --- diff --git a/comps-sync-exclude-list.yml b/comps-sync-exclude-list.yml index 2749283..4921e7e 100644 --- a/comps-sync-exclude-list.yml +++ b/comps-sync-exclude-list.yml @@ -306,9 +306,6 @@ desktop_exclude_list: - NetworkManager-sstp-gnome - NetworkManager-strongswan-gnome - NetworkManager-team - cosmic-desktop: - # Pulls PackageKit in - - cosmic-store cosmic-desktop-apps: # Non-critical apps -> Flatpak - gnome-calculator diff --git a/cosmic-atomic-common.yaml b/cosmic-atomic-common.yaml index 40c485b..81ba19e 100644 --- a/cosmic-atomic-common.yaml +++ b/cosmic-atomic-common.yaml @@ -17,8 +17,6 @@ packages: - fedora-release-ostree-desktop # Portals for Flatpak - xdg-desktop-portal-gtk - # Include GUI to manage updates & Flatpaks - - gnome-software # Power management. Expected to be droped for tuned-ppd - power-profiles-daemon From cce2743fbff813518a79790e4ada26df2e57ad09 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 11 2025 21:28:25 +0000 Subject: [PATCH 4/5] cosmic-common: remove repos from common manifest Signed-off-by: Ryan Brue --- diff --git a/cosmic-atomic-common.yaml b/cosmic-atomic-common.yaml index 81ba19e..5431863 100644 --- a/cosmic-atomic-common.yaml +++ b/cosmic-atomic-common.yaml @@ -19,9 +19,3 @@ packages: - xdg-desktop-portal-gtk # Power management. Expected to be droped for tuned-ppd - power-profiles-daemon - -# Kept in the leaf manifest as they are overwritten by Pungi in composes -repos: - - fedora-rawhide - # - fedora-43 - # - fedora-43-updates From 4e35b58d868269fc21d5c501aeab96e3b78b1318 Mon Sep 17 00:00:00 2001 From: Ryan Brue Date: Mar 11 2025 21:31:51 +0000 Subject: [PATCH 5/5] comps-sync f43 2025-03-11 Re: https://pagure.io/pungi-fedora/pull-request/1458 https://pagure.io/fedora-comps/pull-request/1099 https://pagure.io/fedora-comps/pull-request/1068 Signed-off-by: Ryan Brue --- diff --git a/cosmic-atomic-packages.yaml b/cosmic-atomic-packages.yaml index 5a6331b..2c25ee2 100644 --- a/cosmic-atomic-packages.yaml +++ b/cosmic-atomic-packages.yaml @@ -5,7 +5,9 @@ packages: - cosmic-files - cosmic-player - cosmic-session + - cosmic-store - cosmic-term + - flatpak - gnome-disk-utility - gnome-keyring-pam - gnome-system-monitor @@ -13,3 +15,4 @@ packages: - mesa-dri-drivers - mesa-vulkan-drivers - plymouth-system-theme + - toolbox