PR#199: Switch to per variant fedora-release-* RPM - workstation-ostree-config

workstation-ostree-config

#199 Switch to per variant fedora-release-* RPM

Merged 3 years ago by siosm. Opened 3 years ago by siosm.

siosm/workstation-ostree-config main into main

Switch to per variant fedora-release-* package

Timothée Ravier • 3 years ago

e414f58

fedora-base.yaml

file modified

		`@@ -5,6 +5,10 @@`
		`summary: "Fedora base image for alternative DE"`
		`license: MIT`
		`packages:`
		`+ # Generic release packages for desktop variants and counting`
		`+ - fedora-release`
		`+ - fedora-release-ostree-desktop`
		`+ - fedora-release-ostree-counting`
		`# XWayland support`
		`- xorg-x11-server-Xwayland`
		`# Portals for Flatpak`

fedora-common-ostree.yaml

file modified

-1

		`@@ -6,7 +6,6 @@`
		`include: fedora-common-ostree-pkgs.yaml`

		`packages:`
		`- - fedora-release-silverblue`
		`- git-core`
		`- lvm2`
		`- rpm-ostree`

fedora-deepin.yaml

file modified

		`@@ -5,6 +5,10 @@`
		`summary: "Fedora Deepin base image"`
		`license: MIT`
		`packages:`
		`+ # Generic release packages for desktop variants and counting`
		`+ - fedora-release`
		`+ - fedora-release-ostree-desktop`
		`+ - fedora-release-ostree-counting`
		`# GUI to manage updates & Flatpaks`
		`- gnome-software`

fedora-kinoite.yaml

file modified

		`@@ -5,6 +5,7 @@`
		`summary: "Fedora Kinoite (KDE) base image"`
		`license: MIT`
		`packages:`
		`+ - fedora-release-kinoite`
		`# Wayland support`
		`- kwayland-integration`
		`- kwin-wayland`

fedora-lxqt.yaml

file modified

		`@@ -5,6 +5,10 @@`
		`summary: "Fedora LXQt base image"`
		`license: MIT`
		`packages:`
		`+ # Generic release packages for desktop variants and counting`
		`+ - fedora-release`
		`+ - fedora-release-ostree-desktop`
		`+ - fedora-release-ostree-counting`
		`- libqtxdg`
		`# Portals for Flatpak`
		`- xdg-desktop-portal-kde`

fedora-mate.yaml

file modified

+4 -1

		`@@ -4,8 +4,11 @@`
		`name: fedora-mate`
		`summary: "Fedora Mate base image"`
		`license: MIT`
		`-`
		`packages:`
		`+ - fedora-release-matecompiz`
		`+ # Generic release sub packages for desktop variants and counting`
		`+ - fedora-release-ostree-desktop`
		`+ - fedora-release-ostree-counting`
		`# Portals for Flatpak`
		`- xdg-desktop-portal-gtk`

fedora-pantheon.yaml

file modified

		`@@ -5,6 +5,10 @@`
		`summary: "Fedora Pantheon base image"`
		`license: MIT`
		`packages:`
		`+ # Generic release packages for desktop variants and counting`
		`+ - fedora-release`
		`+ - fedora-release-ostree-desktop`
		`+ - fedora-release-ostree-counting`

		`repos:`
		`- fedora-rawhide`

fedora-silverblue.yaml

file modified

		`@@ -5,6 +5,7 @@`
		`summary: "Fedora Silverblue base image"`
		`license: MIT`
		`packages:`
		`+ - fedora-release-silverblue`
		`- desktop-backgrounds-gnome`
		`- gnome-shell-extension-background-logo`
		`- pinentry-gnome3`

fedora-xfce.yaml

file modified

		`@@ -5,6 +5,10 @@`
		`summary: "Fedora XFCE base image"`
		`license: MIT`
		`packages:`
		`+ - fedora-release-xfce`
		`+ # Generic release sub packages for desktop variants and counting`
		`+ - fedora-release-ostree-desktop`
		`+ - fedora-release-ostree-counting`
		`# Portals for Flatpak`
		`- xdg-desktop-portal-gtk`
		`repos:`

siosm commented 3 years ago

Move the fedora-release-* package requirement to each variant treefile
to enable Kinoite specifc release RPM.

This keeps all other non-official variants on the Silverblue release
RPM for now.

siosm commented 3 years ago

Hold until https://src.fedoraproject.org/rpms/fedora-release/pull-request/172 is merged.

walters commented 3 years ago

I'm not opposed to this inherently but I think we need a larger conversation about basically "Fedora $suffix" and the variations going on here.

To me, the end goal is that we drain the "$suffix" cases into just "Fedora" in more places. And that tendency leans away from separate -release packages.

But anyways, since you already have the release package, seems sane to me.

ngompa commented 3 years ago

:thumbsup:

siosm commented 3 years ago

So this is for Fedora 35 only so we definitely have the time to have that conversation. Wondering where to start to make that happen.

ngompa commented 3 years ago

It is unlikely that we're going to get rid of the RPM per variant setup, since it's used to support the identity stuff for variants and the DNF counting stuff.

siosm commented 3 years ago

That was my first though too. I don't see a clear way to remove / move the variant handling somewhere else right now.

ngompa commented 3 years ago

We should probably have a generic OSTree -release subpackage that non-branded flavors can use, rather than having them use the Silverblue name.

rebased onto 1c715a896bcf354ed9db914d20890607333663c8

3 years ago

rebased onto ce0ee0d4bd4a5d2a90075f236fa75f13bfc92947

3 years ago

siosm commented 3 years ago

Updated to account for changes in https://src.fedoraproject.org/rpms/fedora-release/pull-request/172

rebased onto 84710671cc6fdd1e07d82da510ea8242d41e5a91

3 years ago

rebased onto a799a97

3 years ago

siosm commented 3 years ago

Updated now that https://src.fedoraproject.org/rpms/fedora-release/pull-request/172 has been merged.

Will open a Council discussion soon about branding for other unofficial rpm-ostree based Fedora variants.

ngompa commented 3 years ago

:thumbsup:

rebased onto 47abd09a950933d79b56101b2e89ac9a09394d32

3 years ago

siosm commented 3 years ago

A new fedora release build has been created so this one should be ready for merging and would unblock Kinoite work.

rebased onto b0a0180604a22909260e9a15a2dc0aa50ef277e4

3 years ago

rebased onto c2f2ad924544f9fbe4899623047ab882184231fb

3 years ago

siosm commented 3 years ago

Blocked on review for: https://src.fedoraproject.org/rpms/fedora-release/pull-request/182

Edited 3 years ago by siosm

rebased onto 1f356ce582e23eb5a0429636cfdb9e494dad3046

3 years ago

siosm commented 3 years ago

Alright, I've updated this one with the latest changes from the mentioned PR and this is ready to go. I've verified this works and my latest rawhide unofficial builds are based on that one. This is the last missing piece before Pungi changes that will start Kinoite builds!

rebased onto 1ee2d0ee5a737aacba0f430d5d62442496fdce42

3 years ago

siosm commented 3 years ago

Alright, if nobody complains, I'll merge this one at the beginning of next week. @tpopela @kalev :)

Edited 3 years ago by siosm

ngompa commented 3 years ago

@siosm Can you change each of the flavors that have their own release packages to use it? For example, the LXQt one should use fedora-release-lxqt instead of fedora-release.