From cd3321387f362b8b83473fbe9c230d7bca62fcc3 Mon Sep 17 00:00:00 2001
From: Janne Grunau <janne-fdr@jannau.net>
Date: Sep 19 2025 17:11:54 +0000
Subject: [PATCH 1/2] Drop mesa and flat repos from asahi-repos-devel


Mesa updates can be tested via bodhi in F43 decreasing the need test
copr builds of the same version.
No new builds of the flatpak extension are expected after the 24.08 and
25.08 fdo runtimes carry mesa-25.2. This is the first step of dropping
the flatpak repo completely.

---

diff --git a/asahi-repos.spec b/asahi-repos.spec
index 20ecbac..e882e63 100644
--- a/asahi-repos.spec
+++ b/asahi-repos.spec
@@ -1,6 +1,6 @@
 Name:           asahi-repos
 Version:        1
-Release:        22%{?dist}
+Release:        23%{?dist}
 Summary:        Additional repositories for Apple Silicon hardware enablement
 
 License:        MIT
@@ -73,7 +73,7 @@ cp -p %SOURCE0 %SOURCE1 .
 for source in %{repo_sources}; do
   f="$(basename $source)"
   case "$f" in
-    *mesa*|*u-boot.repo|*scripts.repo|*kernel.repo|*flatpak.repo)
+    *u-boot.repo|*scripts.repo|*kernel.repo)
       sed -e 's/\]$/:devel]/' \
         -e 's,^baseurl=.*$,\0devel/,' \
         -e 's/^name.*$/\0 (devel)/' \
@@ -92,7 +92,6 @@ install -Dpm0644 -t %{buildroot}%{_sysconfdir}/pki/rpm-gpg \
 %if 0%{?fedora} && 0%{?fedora} >= 43
 rm %{buildroot}%{_sysconfdir}/yum.repos.d/group_asahi-flatpak.repo
 rm %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-group_asahi-flatpak
-rm %{buildroot}%{_sysconfdir}/yum.repos.d/group_asahi-flatpak-devel.repo
 %endif
 
 %files
@@ -125,15 +124,7 @@ rm %{buildroot}%{_sysconfdir}/yum.repos.d/group_asahi-flatpak-devel.repo
 %doc README.md
 %config(noreplace) %{_sysconfdir}/yum.repos.d/group_asahi-kernel-devel.repo
 %config(noreplace) %{_sysconfdir}/yum.repos.d/group_asahi-fedora-remix-scripts-devel.repo
-%config(noreplace) %{_sysconfdir}/yum.repos.d/group_asahi-mesa-devel.repo
 %config(noreplace) %{_sysconfdir}/yum.repos.d/group_asahi-u-boot-devel.repo
-%if 0%{?fedora} && 0%{?fedora} < 43
-%config(noreplace) %{_sysconfdir}/yum.repos.d/group_asahi-flatpak-devel.repo
-%endif
-%if "%{_arch}" == "aarch64"
-%config(noreplace) %{_sysconfdir}/yum.repos.d/group_asahi-mesa-i386-devel.repo
-%config(noreplace) %{_sysconfdir}/yum.repos.d/group_asahi-mesa-x86_64-devel.repo
-%endif
 
 %files rawhide-rebuilds
 %license LICENSE
@@ -142,6 +133,10 @@ rm %{buildroot}%{_sysconfdir}/yum.repos.d/group_asahi-flatpak-devel.repo
 %config(noreplace) %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-group_asahi-rawhide-rebuilds
 
 %changelog
+* Sat Sep 13 2025 Janne Grunau <janne-fdr@jannau.net> - 1-23
+- Drop flatpak from asahi-repos-devel
+- Drop mesa repos from asahi-repos-devel
+
 * Sat Sep 13 2025 Davide Cavalca <dcavalca@fedoraproject.org> - 1-22
 - Delete flatpak repo files Fedora 43+
 

From 5280125f8edafda920bd627ded7bd611b6757780 Mon Sep 17 00:00:00 2001
From: Janne Grunau <janne-fdr@jannau.net>
Date: Sep 19 2025 17:15:31 +0000
Subject: [PATCH 2/2] Carry drop-in config for allow_vendor_change=False


---

diff --git a/30-asahi-sticky-vendors.conf b/30-asahi-sticky-vendors.conf
new file mode 100644
index 0000000..9d6ec7a
--- /dev/null
+++ b/30-asahi-sticky-vendors.conf
@@ -0,0 +1,2 @@
+[main]
+allow_vendor_change=False
diff --git a/asahi-repos.spec b/asahi-repos.spec
index e882e63..03f6692 100644
--- a/asahi-repos.spec
+++ b/asahi-repos.spec
@@ -1,6 +1,6 @@
 Name:           asahi-repos
 Version:        1
-Release:        23%{?dist}
+Release:        24%{?dist}
 Summary:        Additional repositories for Apple Silicon hardware enablement
 
 License:        MIT
@@ -26,6 +26,7 @@ Source19:       group_asahi-mesa-i386.repo
 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
 
 %global repo_sources %SOURCE2 %SOURCE4 %SOURCE6 %SOURCE8 %SOURCE10 %SOURCE14 %SOURCE15 %SOURCE17
 %global key_sources %SOURCE3 %SOURCE5 %SOURCE7 %SOURCE9 %SOURCE11 %SOURCE16 %SOURCE18
@@ -90,6 +91,10 @@ install -Dpm0644 -t %{buildroot}%{_sysconfdir}/pki/rpm-gpg \
   %{key_sources}
 
 %if 0%{?fedora} && 0%{?fedora} >= 43
+# Set `allow_vendor_change=False` via dnf drop-in config for f43 and later
+install -Dpm0644 -t %{buildroot}%{_datadir}/dnf5/libdnf.conf.d \
+  %SOURCE23
+
 rm %{buildroot}%{_sysconfdir}/yum.repos.d/group_asahi-flatpak.repo
 rm %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-group_asahi-flatpak
 %endif
@@ -118,6 +123,9 @@ rm %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-group_asahi-flatpak
 %config(noreplace) %{_sysconfdir}/yum.repos.d/group_asahi-steam.repo
 %config(noreplace) %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-group_asahi-steam
 %endif
+%if 0%{?fedora} && 0%{?fedora} >= 43
+%{_datadir}/dnf5/libdnf.conf.d/30-asahi-sticky-vendors.conf
+%endif
 
 %files devel
 %license LICENSE
@@ -133,6 +141,9 @@ rm %{buildroot}%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-group_asahi-flatpak
 %config(noreplace) %{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-group_asahi-rawhide-rebuilds
 
 %changelog
+* Sun Sep 14 2025 Janne Grunau <janne-fdr@jannau.net> - 1-24
+- Set allow_vendor_change to false in config drop-in file for F43+
+
 * Sat Sep 13 2025 Janne Grunau <janne-fdr@jannau.net> - 1-23
 - Drop flatpak from asahi-repos-devel
 - Drop mesa repos from asahi-repos-devel