public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/m1n1] rawhide: Add backward compatibility symlink for update-m1n1
@ 2026-08-03  9:09 Janne Grunau
  0 siblings, 0 replies; only message in thread
From: Janne Grunau @ 2026-08-03  9:09 UTC (permalink / raw)
  To: git-commits

            A new commit has been pushed.

            Repo   : rpms/m1n1
            Branch : rawhide
            Commit : 7e9019088a80510c48590cf93d3d152d4d5ea0fc
            Author : Janne Grunau <janne-fdr@jannau.net>
            Date   : 2026-08-02T22:58:23+02:00
            Stats  : +10/-0 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/m1n1/c/7e9019088a80510c48590cf93d3d152d4d5ea0fc?branch=rawhide

            Log:
            Add backward compatibility symlink for update-m1n1

The change to a noarch package moved the the install path for m1n1.bin
from "/usr/lib64/m1n1" to "/usr/lib/m1n1". update-m1n1 unfortunately
hardcodes the former path. Updating update-m1n1 is possible but since
this is a critical part of the bootchain for Fedora Asahi Remix systems
it has to be handled with care. Provide the symlink as backward
compatibility for a while.
This is unfortunately complicated by different build environments for
noarch packages in koji and mock. In mock on aarch64  %{_libdir} still
expands to "/usr/lib64".

---
diff --git a/m1n1.spec b/m1n1.spec
index d6879e0..cab00cf 100644
--- a/m1n1.spec
+++ b/m1n1.spec
@@ -148,6 +148,15 @@ popd
 %install
 install -Dpm0644 -t %{buildroot}%{_libdir}/%{name} \
   build/%{name}.{bin,macho} build/%{name}-asahi.bin
+# install backwards compatibility symlink since update-m1n1 hardcodes
+# `/usr/lib64/m1n1/m1n1.bin` as m1n1 binary
+# check if the dir exists since %{_libdir} expands to "/usr/lib64" for
+# aarch64 builds in mock
+if [ ! -d %{buildroot}%{_exec_prefix}/lib64/%{name} ]; then
+  mkdir -p %{buildroot}%{_exec_prefix}/lib64/%{name}
+  ln -s %{_libdir}/%{name}/%{name}.bin \
+    %{buildroot}%{_exec_prefix}/lib64/m1n1/%{name}.bin
+fi
 install -Dpm0644 -t %{buildroot}%{_libdir}/%{name}-stage1 \
   build-stage1/%{name}.{bin,macho} build-stage1/%{name}-asahi.bin
 install -Ddpm0755 %{buildroot}%{_libexecdir}/%{name}
@@ -160,6 +169,7 @@ install -Dpm0644 m1n1.conf.example %{buildroot}%{_sysconfdir}/m1n1.conf
 %doc README.md
 %doc m1n1.conf.example
 %{_libdir}/%{name}/
+%{_exec_prefix}/lib64/%{name}
 %config(noreplace) %{_sysconfdir}/m1n1.conf
 
 %files stage1

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-08-03  9:09 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-03  9:09 [rpms/m1n1] rawhide: Add backward compatibility symlink for update-m1n1 Janne Grunau

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox