From 19ce0c84ef0a0cf0fc1b2390f7bdb694eb21ad25 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Apr 25 2026 10:42:57 +0000 Subject: [PATCH 1/2] Prepare for dropping unused mesa repos after F44 Mark the mesa repo as `skip_if_unavailable=True` for F44+ and drop the x86 mesa overlay repos. --- diff --git a/asahi-repos.spec b/asahi-repos.spec index f1800f8..0270ade 100644 --- a/asahi-repos.spec +++ b/asahi-repos.spec @@ -1,6 +1,6 @@ Name: asahi-repos Version: 1 -Release: 27%{?dist} +Release: 28%{?dist} Summary: Additional repositories for Apple Silicon hardware enablement License: MIT @@ -34,7 +34,9 @@ Source25: dnf5vendor-asahitransition-to-fedora.toml %global key_sources %SOURCE3 %SOURCE5 %SOURCE7 %SOURCE9 %SOURCE11 %SOURCE16 %SOURCE18 %dnl install mesa x86 overlay repos only on aarch64 %if "%{_arch}" == "aarch64" +%if 0%{?fedora} && 0%{?fedora} < 44 %global repo_sources %{repo_sources} %SOURCE19 %SOURCE20 +%endif %global repo_sources %{repo_sources} %SOURCE21 %global key_sources %{key_sources} %SOURCE22 %endif @@ -75,8 +77,10 @@ maintained by the Fedora Asahi SIG. %config(noreplace) %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-group_asahi-flatpak %endif %if "%{_arch}" == "aarch64" +%if 0%{?fedora} && 0%{?fedora} < 44 %config(noreplace) %{_sysconfdir}/yum.repos.d/group_asahi-mesa-i386.repo %config(noreplace) %{_sysconfdir}/yum.repos.d/group_asahi-mesa-x86_64.repo +%endif %config(noreplace) %{_sysconfdir}/yum.repos.d/group_asahi-steam.repo %config(noreplace) %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-group_asahi-steam %endif @@ -145,6 +149,11 @@ cp -p %SOURCE0 %SOURCE1 . %if 0%{?fedora} && 0%{?fedora} >= 43 sed -i -e 's/priority=5/priority=200/' %SOURCE8 %endif +# skip group_asahi-mesa.repo if unavailable starting with F44. The repo will be +# dropped in the future (The copr project could be deleted after F44 goes EOL). +%if 0%{?fedora} && 0%{?fedora} >= 44 +sed -i -e 's/^\(skip_if_unavailable=\).*$/\1=True/' %SOURCE8 +%endif for source in %{repo_sources}; do f="$(basename $source)" @@ -190,6 +199,9 @@ rm %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-group_asahi-flatpak %endif %changelog +* Sat Apr 25 2026 Janne Grunau - 1-28 +- Prepare for dropping unused mesa repos after F44 + * Mon Apr 20 2026 Janne Grunau - 1-27 - Update kernel-devel baseurl after pulp migration - Skip *-devel repos if unavailable From 2d630549a0ae1483b74e40cb71fb0a2813ebd154 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Apr 27 2026 11:46:56 +0000 Subject: [PATCH 2/2] Switch to package specific vendor change policy Fedora 44 ships dnf 5.4.1.0 which allows package based filtering in the vendor change configuration. Use this to avoid an additional update due to a transitional vendor override. dnf only considers files with .conf as suffix. --- diff --git a/asahi-repos.spec b/asahi-repos.spec index 0270ade..b6c8c2e 100644 --- a/asahi-repos.spec +++ b/asahi-repos.spec @@ -1,6 +1,6 @@ Name: asahi-repos Version: 1 -Release: 28%{?dist} +Release: 29%{?dist} Summary: Additional repositories for Apple Silicon hardware enablement License: MIT @@ -27,8 +27,8 @@ Source20: group_asahi-mesa-x86_64.repo Source21: group_asahi-steam.repo Source22: RPM-GPG-KEY-group_asahi-steam Source23: 30-asahi-sticky-vendors.conf -Source24: dnf5vendor-asahicopr-to-asahitransition.toml -Source25: dnf5vendor-asahitransition-to-fedora.toml +Source24: dnf5vendor-asahicopr-mesa.conf +Source25: dnf5vendor-asahicopr-virglrenderer.conf %global repo_sources %SOURCE2 %SOURCE4 %SOURCE6 %SOURCE8 %SOURCE10 %SOURCE14 %SOURCE15 %SOURCE17 %global key_sources %SOURCE3 %SOURCE5 %SOURCE7 %SOURCE9 %SOURCE11 %SOURCE16 %SOURCE18 @@ -49,7 +49,7 @@ Provides: %{name}-common = %{version}-%{release} Obsoletes: %{name}-edge <= 1-19 %endif %if (0%{?fedora} && 0%{?fedora} >= 43) -Requires: (%{name}-dnf5-vendorchange-config = %{version}-%{release} if libdnf5 >= 5.3) +Requires: (%{name}-dnf5-vendorchange-config = %{version}-%{release} if libdnf5 >= 5.4) %endif BuildArch: noarch @@ -102,8 +102,8 @@ allow automatic package transitions for obsolete SIG packages. %files dnf5-vendorchange-config %license LICENSE %doc README.md -%{_datadir}/dnf5/vendors.d/asahicopr-to-asahitransition.toml -%{_datadir}/dnf5/vendors.d/asahitransition-to-fedora.toml +%{_datadir}/dnf5/vendors.d/asahicopr-mesa.conf +%{_datadir}/dnf5/vendors.d/asahicopr-virglrenderer.conf %endif %dnl -------------------------------------------------------------------------------------- @@ -190,15 +190,18 @@ install -Dpm0644 -t %{buildroot}%{_datadir}/dnf5/libdnf.conf.d \ # Install DNF vendor policy configuration, cf. dnf5.conf-vendorpolicy(5) mkdir -p %{buildroot}%{_datadir}/dnf5/vendors.d install -pm 0644 %{SOURCE24} \ - %{buildroot}%{_datadir}/dnf5/vendors.d/asahicopr-to-asahitransition.toml + %{buildroot}%{_datadir}/dnf5/vendors.d/asahicopr-mesa.conf install -pm 0644 %{SOURCE25} \ - %{buildroot}%{_datadir}/dnf5/vendors.d/asahitransition-to-fedora.toml + %{buildroot}%{_datadir}/dnf5/vendors.d/asahicopr-virglrenderer.conf rm %{buildroot}%{_sysconfdir}/yum.repos.d/group_asahi-flatpak.repo rm %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-group_asahi-flatpak %endif %changelog +* Sat Apr 25 2026 Janne Grunau - 1-29 +- Switch to package specific vendor change policy + * Sat Apr 25 2026 Janne Grunau - 1-28 - Prepare for dropping unused mesa repos after F44 diff --git a/dnf5vendor-asahicopr-mesa.conf b/dnf5vendor-asahicopr-mesa.conf new file mode 100644 index 0000000..aed24fa --- /dev/null +++ b/dnf5vendor-asahicopr-mesa.conf @@ -0,0 +1,15 @@ +version = '1.1' + +[[outgoing_packages]] +filters = [ + { filter = 'source_name', value = 'mesa' } +] + +[[incoming_vendors]] +vendor = 'Fedora Project' + +[[outgoing_vendors]] +vendor = 'Fedora Copr - group @asahi' + +[[outgoing_vendors]] +vendor = 'Fedora Asahi - Transitional' diff --git a/dnf5vendor-asahicopr-to-asahitransition.toml b/dnf5vendor-asahicopr-to-asahitransition.toml deleted file mode 100644 index f98e8ba..0000000 --- a/dnf5vendor-asahicopr-to-asahitransition.toml +++ /dev/null @@ -1,9 +0,0 @@ -version = '1.0' - -[[outgoing_vendors]] -comparator = "EXACT" -vendor = "Fedora Copr - group @asahi" - -[[incoming_vendors]] -comparator = "EXACT" -vendor = "Fedora Asahi - Transitional" diff --git a/dnf5vendor-asahicopr-virglrenderer.conf b/dnf5vendor-asahicopr-virglrenderer.conf new file mode 100644 index 0000000..a49fdbb --- /dev/null +++ b/dnf5vendor-asahicopr-virglrenderer.conf @@ -0,0 +1,15 @@ +version = '1.1' + +[[outgoing_packages]] +filters = [ + { filter = 'source_name', value = 'virglrenderer' } +] + +[[incoming_vendors]] +vendor = 'Fedora Project' + +[[outgoing_vendors]] +vendor = 'Fedora Copr - group @asahi' + +[[outgoing_vendors]] +vendor = 'Fedora Asahi - Transitional' diff --git a/dnf5vendor-asahitransition-to-fedora.toml b/dnf5vendor-asahitransition-to-fedora.toml deleted file mode 100644 index fe14425..0000000 --- a/dnf5vendor-asahitransition-to-fedora.toml +++ /dev/null @@ -1,9 +0,0 @@ -version = '1.0' - -[[outgoing_vendors]] -comparator = "EXACT" -vendor = "Fedora Asahi - Transitional" - -[[incoming_vendors]] -comparator = "EXACT" -vendor = "Fedora Project"