From 3173d1649db16404af28988c379881809be129a9 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Feb 21 2024 02:41:16 +0000 Subject: [PATCH 1/5] fedora-common-ostree: Use releasever treefile parameter --- diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml index c94035e..fb96be2 100644 --- a/fedora-common-ostree.yaml +++ b/fedora-common-ostree.yaml @@ -1,7 +1,8 @@ ref: fedora/40/${basearch}/ostree-base -automatic_version_prefix: "40." -mutate-os-release: "40" +releasever: 40 +automatic_version_prefix: "${releasever}." +mutate-os-release: "${releasever}" # Default to `bash` in our container, the same as other containers we ship. container-cmd: From 76f138882ec364d960e0f045071b8643698b0c27 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Feb 21 2024 02:41:16 +0000 Subject: [PATCH 2/5] fedora-common-ostree: Use new parameter name for automatic-version-prefix --- diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml index fb96be2..7677f14 100644 --- a/fedora-common-ostree.yaml +++ b/fedora-common-ostree.yaml @@ -1,7 +1,7 @@ ref: fedora/40/${basearch}/ostree-base releasever: 40 -automatic_version_prefix: "${releasever}." +automatic-version-prefix: "${releasever}." mutate-os-release: "${releasever}" # Default to `bash` in our container, the same as other containers we ship. From 7642995f92368c324787d815e9ea978c6039feec Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Feb 21 2024 02:41:16 +0000 Subject: [PATCH 3/5] 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 7677f14..889087b 100644 --- a/fedora-common-ostree.yaml +++ b/fedora-common-ostree.yaml @@ -1,5 +1,3 @@ -ref: fedora/40/${basearch}/ostree-base - releasever: 40 automatic-version-prefix: "${releasever}." mutate-os-release: "${releasever}" From c93018cc521f4f64fe8c59d10a9bd18ecd69623a Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Feb 21 2024 02:41:16 +0000 Subject: [PATCH 4/5] fedora-sericea: Misc style alignment Align with other manifests. --- diff --git a/fedora-sericea.yaml b/fedora-sericea.yaml index be95b80..aeef5c8 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/40/${basearch}/sericea rojig: name: fedora-sericea From 4db0f163faff16c3d722460a05e705b6d146fe39 Mon Sep 17 00:00:00 2001 From: Timothée Ravier Date: Feb 21 2024 02:41:16 +0000 Subject: [PATCH 5/5] manifests: Update names to follow new Atomic branding --- diff --git a/fedora-base.yaml b/fedora-base.yaml index c112dac..301bafb 100644 --- a/fedora-base.yaml +++ b/fedora-base.yaml @@ -2,7 +2,7 @@ include: fedora-common-ostree.yaml ref: fedora/40/${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 c2186d1..aa21712 100644 --- a/fedora-cinnamon.yaml +++ b/fedora-cinnamon.yaml @@ -2,7 +2,7 @@ include: cinnamon-desktop-pkgs.yaml ref: fedora/40/${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 7670409..127aaad 100644 --- a/fedora-deepin.yaml +++ b/fedora-deepin.yaml @@ -2,7 +2,7 @@ include: deepin-desktop-pkgs.yaml ref: fedora/40/${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 0955cf5..856f438 100644 --- a/fedora-kinoite.yaml +++ b/fedora-kinoite.yaml @@ -2,7 +2,7 @@ include: kde-desktop-pkgs.yaml ref: fedora/40/${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 1df89a4..1cfc40b 100644 --- a/fedora-lazurite.yaml +++ b/fedora-lazurite.yaml @@ -2,7 +2,7 @@ include: lxqt-desktop-pkgs.yaml ref: fedora/40/${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 a1ceb28..da2deee 100644 --- a/fedora-mate.yaml +++ b/fedora-mate.yaml @@ -2,7 +2,7 @@ include: mate-desktop-pkgs.yaml ref: fedora/40/${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 f66ead4..d0bab9b 100644 --- a/fedora-onyx.yaml +++ b/fedora-onyx.yaml @@ -2,7 +2,7 @@ include: budgie-desktop-pkgs.yaml ref: fedora/40/${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 aeef5c8..5887588 100644 --- a/fedora-sericea.yaml +++ b/fedora-sericea.yaml @@ -2,7 +2,7 @@ include: sway-desktop-pkgs.yaml ref: fedora/40/${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 96b7703..8fc90bf 100644 --- a/fedora-silverblue.yaml +++ b/fedora-silverblue.yaml @@ -2,7 +2,7 @@ include: gnome-desktop-pkgs.yaml ref: fedora/40/${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 1420dd6..5b15dac 100644 --- a/fedora-vauxite.yaml +++ b/fedora-vauxite.yaml @@ -2,7 +2,7 @@ include: xfce-desktop-pkgs.yaml ref: fedora/40/${basearch}/vauxite rojig: name: fedora-vauxite - summary: "Fedora Vauxite (XFCE) base image" + summary: "Fedora XFCE Atomic" license: MIT packages: