From 0cb972a2c26e35f16e4f22ac430152c827589232 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Feb 21 2024 02:04:54 +0000 Subject: [PATCH 1/3] fedora-common-ostree: Remove unused 'ref' We never directly compose this manifest. The minimal version of a desktop less Atomic desktop is `fedora-base.yaml`. --- diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml index ac048a9..c9cdbc0 100644 --- a/fedora-common-ostree.yaml +++ b/fedora-common-ostree.yaml @@ -1,5 +1,3 @@ -ref: fedora/rawhide/${basearch}/ostree-base - releasever: 41 automatic-version-prefix: "${releasever}." mutate-os-release: "${releasever}" From 23ce77dede163a0d5720286fd310606840f650ca Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Feb 21 2024 02:04:54 +0000 Subject: [PATCH 2/3] fedora-sericea: Misc style alignment Align with other manifests. --- diff --git a/fedora-sericea.yaml b/fedora-sericea.yaml index 48325de..63dc62c 100644 --- a/fedora-sericea.yaml +++ b/fedora-sericea.yaml @@ -1,5 +1,4 @@ -include: - - sway-desktop-pkgs.yaml +include: sway-desktop-pkgs.yaml ref: fedora/rawhide/${basearch}/sericea rojig: name: fedora-sericea From c6795e145610f587bc56829fd3c2038c69364570 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Feb 21 2024 02:04:54 +0000 Subject: [PATCH 3/3] manifests: Update names to follow new Atomic branding --- diff --git a/fedora-base.yaml b/fedora-base.yaml index ef829f4..6d0b132 100644 --- a/fedora-base.yaml +++ b/fedora-base.yaml @@ -2,7 +2,7 @@ include: fedora-common-ostree.yaml ref: fedora/rawhide/${basearch}/base rojig: name: fedora-base - summary: "Fedora base image for alternative DE" + summary: "Fedora Base Atomic" license: MIT packages: diff --git a/fedora-cinnamon.yaml b/fedora-cinnamon.yaml index ffa4c2b..b94e15d 100644 --- a/fedora-cinnamon.yaml +++ b/fedora-cinnamon.yaml @@ -2,7 +2,7 @@ include: cinnamon-desktop-pkgs.yaml ref: fedora/rawhide/${basearch}/cinnamon rojig: name: fedora-cinnamon - summary: "Fedora Cinnamon base image" + summary: "Fedora Cinnamon Atomic" license: MIT packages: diff --git a/fedora-deepin.yaml b/fedora-deepin.yaml index fbe280a..2db7a5e 100644 --- a/fedora-deepin.yaml +++ b/fedora-deepin.yaml @@ -2,7 +2,7 @@ include: deepin-desktop-pkgs.yaml ref: fedora/rawhide/${basearch}/deepin rojig: name: fedora-deepin - summary: "Fedora Deepin base image" + summary: "Fedora Deepin Atomic" license: MIT packages: diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml index ae0adb8..b3543b6 100644 --- a/fedora-kinoite.yaml +++ b/fedora-kinoite.yaml @@ -2,7 +2,7 @@ include: kde-desktop-pkgs.yaml ref: fedora/rawhide/${basearch}/kinoite rojig: name: fedora-kde - summary: "Fedora Kinoite (KDE) base image" + summary: "Fedora Kinoite" license: MIT packages: diff --git a/fedora-lazurite.yaml b/fedora-lazurite.yaml index 623dee7..d03a14c 100644 --- a/fedora-lazurite.yaml +++ b/fedora-lazurite.yaml @@ -2,7 +2,7 @@ include: lxqt-desktop-pkgs.yaml ref: fedora/rawhide/${basearch}/lazurite rojig: name: fedora-lxqt - summary: "Fedora Lazurite (LXQt) base image" + summary: "Fedora LXQt Atomic" license: MIT packages: diff --git a/fedora-mate.yaml b/fedora-mate.yaml index cbf4d46..cdfd0f4 100644 --- a/fedora-mate.yaml +++ b/fedora-mate.yaml @@ -2,7 +2,7 @@ include: mate-desktop-pkgs.yaml ref: fedora/rawhide/${basearch}/mate rojig: name: fedora-mate - summary: "Fedora Mate base image" + summary: "Fedora Mate Atomic" license: MIT packages: diff --git a/fedora-onyx.yaml b/fedora-onyx.yaml index f85be7e..588799f 100644 --- a/fedora-onyx.yaml +++ b/fedora-onyx.yaml @@ -2,7 +2,7 @@ include: budgie-desktop-pkgs.yaml ref: fedora/rawhide/${basearch}/onyx rojig: name: fedora-onyx - summary: "Fedora Onyx (Budgie) base image" + summary: "Fedora Budgie Atomic" license: MIT packages: diff --git a/fedora-sericea.yaml b/fedora-sericea.yaml index 63dc62c..f36fa00 100644 --- a/fedora-sericea.yaml +++ b/fedora-sericea.yaml @@ -2,7 +2,7 @@ include: sway-desktop-pkgs.yaml ref: fedora/rawhide/${basearch}/sericea rojig: name: fedora-sericea - summary: "Fedora Sericea (Sway) base image" + summary: "Fedora Sway Atomic" license: MIT packages: diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml index 413372b..1dc0b8c 100644 --- a/fedora-silverblue.yaml +++ b/fedora-silverblue.yaml @@ -2,7 +2,7 @@ include: gnome-desktop-pkgs.yaml ref: fedora/rawhide/${basearch}/silverblue rojig: name: fedora-silverblue - summary: "Fedora Silverblue base image" + summary: "Fedora Silverblue" license: MIT packages: diff --git a/fedora-vauxite.yaml b/fedora-vauxite.yaml index 3281a13..8858139 100644 --- a/fedora-vauxite.yaml +++ b/fedora-vauxite.yaml @@ -2,7 +2,7 @@ include: xfce-desktop-pkgs.yaml ref: fedora/rawhide/${basearch}/vauxite rojig: name: fedora-vauxite - summary: "Fedora Vauxite (XFCE) base image" + summary: "Fedora XFCE Atomic" license: MIT packages: