#9 Add flatpak subpackage with GPU/GL extensions for FDO runtimes
Merged 8 months ago by ngompa. Opened 8 months ago by jannau.
fedora-asahi/ jannau/asahi-platform-metapackage flatpak  into  main

@@ -3,7 +3,7 @@ 

  

  Name:           asahi-platform-metapackage

  Version:        0

- Release:        11%{?dist}

+ Release:        12%{?dist}

  Summary:        Metapackage declaring Asahi platform dependencies

  Group:          Metapackages

  License:        MIT
@@ -15,6 +15,7 @@ 

  Requires:       (%{name}-audio = %{version}-%{release} if pipewire)

  Requires:       (%{name}-plasma = %{version}-%{release} if plasma-desktop)

  Requires:       (%{name}-firefox = %{version}-%{release} if firefox)

+ Recommends:     (%{name}-flatpak = %{version}-%{release} if flatpak)

  %dnl If/when we have desktop subpackages or whatever, we can make them

  %dnl conditional dependencies with the following format:

  %dnl Requires:       (%{name}-desktop-<variant> = %{version}-%{release} if <desktop-main-package>)
@@ -95,6 +96,20 @@ 

  

  %dnl -------------------------------------------------------------------

  

+ %package flatpak

+ Summary:        Metapackage declaring Flatpak support Asahi platform dependencies

+ Requires:       mesa-asahi-22.08-flatpak

+ Requires:       mesa-asahi-23.08-flatpak

+ 

+ %description flatpak

+ This package declares the Flatpak dependencies for the Asahi platform. This are primarily

+ GPU driver extensions for supported runtimes.

+ 

+ %files flatpak

+ %dnl No files to ship

+ 

+ %dnl -------------------------------------------------------------------

+ 

  %prep

  %dnl Nothing to do

  
@@ -118,6 +133,9 @@ 

      > %{buildroot}%{_libdir}/firefox/defaults/pref/asahi.js

  

  %changelog

+ * Tue Jul 16 2024 Janne Grunau <janne-fdr@jannau.net> - 0-12

+ - Add flatpak subpackage with GPU/GL extensions for FDO runtimes

+ 

  * Thu May 30 2024 Davide Cavalca <dcavalca@fedoraproject.org>

  - Require the latest dracut-asahi

  

This should probably wait a few days before merging / building to allow the asahi-repos update to be installed. That adds the flatpak copr as repo which contains mesa-asahi-22.08-flatpak / mesa-asahi-23.08-flatpak. The packages have to be be upgraded sequentially so that we can install packages from https://copr.fedorainfracloud.org/coprs/g/asahi/flatpak/builds/ when asahi-platform-metapackage-flatpak is installed.

Is this going to reliably work? We can't expect users to update asahi-repos with any particular timing. We need to test the case where this update and the asahi-repos update are run at the same time. If that fails with a fatal error without overrides, then this has to wait O(months) to allow most people to have updated the installed asahi-repos, unless we find some mechanism to make it nonfatal or resolve the issue some other way. cc @ngompa for advice.

dnf upgrade notes that it will skip packages with conflicts and just upgrade asahi-repos. Discover handles this as well without user visible complaints. It updates first asahi-repos and afther that upgrade asahi-platform-metapackage upgrades (including flatpak extensions) are available.
I'm not 100% confident that my testing using a local repository for asahi-platform-metapackage
is fully sufficient. I'm surprised that it worked with allow_vender_change=false.

The grace period is solely to avoid that everyone runs into this "issue" and seeks for help or tries to fix it themself.

SGTM then. We should do a quick test after this is merged on a machine without the other update, just to confirm with the production repo setup (so we can revert if it causes a bigger issue).

rebased onto 916f5c2

8 months ago

rebased onto 916f5c2

8 months ago

With Recommends: dnf doesn't complain any more about skipped packages so we should be good to go from a rollout perspective. The announcement still needs to mention that it might require 2 updates if asahi-repos-1-13. is not yet installed.

Note that with the runtime packages being Recommends instead of Requires, DNF will never re-evaluate them unless the dependency is upgraded or if the package is uninstalled and reinstalled. It'll be treated as if those dependencies were explicitly excluded by the user. That's why I suggested Requires for the subpackage and Recommends for the boolean dependency.

That's not re-evaluating Recommends is a problem for asahi-platform-metapackage-flatpak then as well. If asahi-repos wasn't already updated asahi-platform-metapackage-flatpak will not be installed later. There doesn't seem to be a way around this. Maybe we should build the runtimes in the mesa copr since we need to update them for UAPI changes in sync anyway.

Switching the Recommends: for the runtimes back to Requires:

rebased onto 916f5c2

8 months ago

That's not re-evaluating Recommends is a problem for asahi-platform-metapackage-flatpak then as well.

I think we'll switch it to a strong dependency in a few months, and then downgrade it again later if we want.

Pull-Request has been merged by ngompa

8 months ago
Metadata