Record the boot recipes as manual holds and state pacman's repository order

A bare uboot-asahi comes from whichever repository is listed first, so the comment now says when this build wins and when asahi-alarm's does.
2026-09-25 17:34:34 +10:00
1 parent d7906a4b1a
commit d61e51af75
@@ -170,6 +170,8 @@ These packages were already excluded from automatic AUR updates. The migration p

 `linux-firmware-cirrus` is a deliberate hold: a self-retiring shim that ships Arch's linux-firmware-cirrus 20260910-2 payload to stable while stable's Arch snapshot is on 20260810-2 (Dell XPS 13 DX13260 / 1028:0e54 speaker firmware). It is versioned 20260810-3 so the genuine Arch package supersedes it as soon as the snapshot advances; bumping it to the Arch version would defeat that. Delete the recipe once stable's snapshot carries linux-firmware >= 20260910.

+`m1n1-aurora` and `uboot-asahi` are deliberate holds: Apple Silicon boot code, pinned by hand like `linux-aurora`, and bumped only after a cold boot on the qualification Macs. `m1n1-aurora` pins an aurora-silicon/m1n1 commit plus a local patch. `uboot-asahi` follows asahi-alarm's recipe and patch set (asahi-alarm/PKGBUILDs), which a tag watch on AsahiLinux/u-boot cannot carry.
+
 ## Package-specific boundaries

 - NVIDIA watches remain on the 580 driver branch.
@@ -1,4 +1,5 @@
 {
  "source": "local",
-  "channels": ["edge"]
+  "channels": ["edge"],
+  "sync": false
 }
@@ -4,7 +4,7 @@ m1n1 v1.6.1 from aurora-silicon/m1n1 (06a4601a351ebfd1abb6abba9a44c34e40d94776)

 ## Pairing with linux-aurora

- It provides `m1n1=1.6.1.aurora1`, which satisfies linux-aurora's `m1n1>=1.6.1`, and conflicts with asahi-alarm's `m1n1`. pacman prefers a package literally named `m1n1` over a provider, so an Aurora transaction names `m1n1-aurora` explicitly.
+- It provides `m1n1=1.6.1.aurora1`, which satisfies linux-aurora's `m1n1>=1.6.1`, and conflicts with asahi-alarm's `m1n1`. pacman prefers a package literally named `m1n1` over a provider, so an Aurora transaction names `m1n1-aurora` explicitly and accepts its conflict with `m1n1` (`--ask 4` under `--noconfirm`).
 - It owns `/usr/lib/asahi-boot/m1n1.bin`. asahi-scripts' `95-m1n1-install.hook` runs `update-m1n1` when that file, `/usr/lib/modules/*/dtbs/*` or U-Boot changes. `update-m1n1` writes m1n1, the device trees and gzipped U-Boot into `m1n1/boot.bin` on the system ESP. asahi-alarm's default takes the device trees from the newest `/lib/modules/*-ARCH/dtbs`, which is where linux-aurora installs its Apple DTBs. `/etc/default/update-m1n1` overrides are left alone.
 - Raising linux-aurora's `_m1n1_version` above 1.6.1 needs an m1n1-aurora whose provided version satisfies it, released first.

@@ -1,4 +1,5 @@
 {
  "source": "local",
-  "channels": ["edge"]
+  "channels": ["edge"],
+  "sync": false
 }
@@ -3,12 +3,14 @@
 # boots straight to the boot menu and the splash without U-Boot's text.
 #
 # Same name as asahi-alarm's, and nothing generic depends on it, so it only
-# ever replaces their build on a Mac that has [asahi-alarm] configured. Keep
-# pkgver and the patch set in step with asahi-alarm's and pkgrel above
-# theirs: once installed, pacman keeps this build over theirs at the same
-# pkgver whichever repository is listed first, and a newer asahi-alarm pkgver
-# wins until this recipe follows it. No epoch, which would outrank every
-# future asahi-alarm release.
+# ever replaces their build on a Mac that has [asahi-alarm] configured.
+# pacman takes a package from the first repository that carries its name:
+# with [omarchy] ahead of [asahi-alarm] this build is installed and kept even
+# after asahi-alarm moves on; with [asahi-alarm] ahead it is installed only as
+# omarchy/uboot-asahi, kept over their build at the same pkgver, and replaced
+# by a newer one. Keep pkgver and the patch set in step with asahi-alarm's and
+# pkgrel above theirs. No epoch, which would outrank every future asahi-alarm
+# release.

 pkgname=uboot-asahi
 _ver=2026.07