From 23bfb75f07a70c13bb61152e4eef5f024b36a0b9 Mon Sep 17 00:00:00 2001 From: Marcelo Alcantara Date: Sat, 26 Sep 2026 09:20:37 +1000 Subject: [PATCH 1/4] omarchy-mac-boot 20260925-4: pin quattro-upstream 84352fdb Moves the pin from f7ea7ecc to the head of quattro-upstream, which adds #552's reset-prepare, reset-verify, reset-commit and reset-rollback entrypoints, #553's luks-slots entrypoint and recovery key handling, #556's encrypt unit output to kmsg at notice, and #560's snapshot restore check with its limine-snapper-sync pre and post hooks. The pin's UTC date is still 20260925, so pkgrel goes to 4. #544 is not in it, so the Plymouth fragment still ships and no HOOKS baseline dependency applies. --- pkgbuilds/omarchy-mac-boot/PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgbuilds/omarchy-mac-boot/PKGBUILD b/pkgbuilds/omarchy-mac-boot/PKGBUILD index 184a6b97..a00798f4 100644 --- a/pkgbuilds/omarchy-mac-boot/PKGBUILD +++ b/pkgbuilds/omarchy-mac-boot/PKGBUILD @@ -8,7 +8,7 @@ pkgname=omarchy-mac-boot # 20260921-N. Reset pkgrel to 1 when pkgver changes; bump it to re-pin or # rebuild on the same day. pkgver=20260925 -pkgrel=3 +pkgrel=4 pkgdesc='Apple Silicon boot support for Omarchy: initramfs, in-place encryption, first boot and Limine activation' arch=('aarch64') groups=('omarchy-platform-apple-silicon') @@ -20,9 +20,9 @@ conflicts=('omarchy-apple-boot' 'omarchy-first-boot') replaces=('omarchy-apple-boot' 'omarchy-first-boot') install=omarchy-mac-boot.install # An exact omarchy-mac commit, never a branch. -_commit=f7ea7ecc804a133e1afe571b708458a6d71db77d +_commit=84352fdb8fd03d149682ac54466b1a1add176f84 source=("omarchy-mac::git+https://github.com/omacom/omarchy-mac.git#commit=${_commit}") -sha256sums=('b14b862e8f22cb7db49afcf7e380bc92d532967cc0edef72adfda54a1eb5605b') +sha256sums=('06514d03eef7e8468277ae97c3258bc595f307aa0cf3356d3f71cfb6b0d14fe2') prepare() { # Tests and staging must not be able to read the surrounding desktop source. From cfb8f9a403e31150ece7caa757f5b9d2fa366751 Mon Sep 17 00:00:00 2001 From: Marcelo Alcantara Date: Sat, 26 Sep 2026 09:20:37 +1000 Subject: [PATCH 2/4] omarchy-mac-boot: depend on binutils for objcopy The boot check and, from #560, the snapshot restore check read the kernel out of the Limine UKI with objcopy. mkinitcpio pulls binutils in today, but the package calls it directly. --- pkgbuilds/omarchy-mac-boot/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgbuilds/omarchy-mac-boot/PKGBUILD b/pkgbuilds/omarchy-mac-boot/PKGBUILD index a00798f4..d1e6eaaa 100644 --- a/pkgbuilds/omarchy-mac-boot/PKGBUILD +++ b/pkgbuilds/omarchy-mac-boot/PKGBUILD @@ -41,8 +41,8 @@ package() { # desktop or a boot chain. 1.39.0-2 is the first limine-mkinitcpio-hook that # leaves a Mac's /boot to mkinitcpio until Limine is activated. depends=('omarchy' 'limine' 'limine-mkinitcpio-hook>=1.39.0-2' 'limine-snapper-sync' 'asahi-scripts' - 'bash' 'btrfs-progs' 'coreutils' 'cpio' 'cryptsetup' 'diffutils' 'gawk' 'gnupg' 'grep' 'gum' - 'gzip' 'kbd' 'mkinitcpio' 'sed' 'systemd' 'util-linux') + 'bash' 'binutils' 'btrfs-progs' 'coreutils' 'cpio' 'cryptsetup' 'diffutils' 'gawk' 'gnupg' 'grep' + 'gum' 'gzip' 'kbd' 'mkinitcpio' 'sed' 'systemd' 'util-linux') "$srcdir/boot/install" "$pkgdir" # Once the source drops its own Plymouth fragment (omacom/omarchy-mac#544), From e70090513c5cdfa6eac1d06837fb261216b3e7e5 Mon Sep 17 00:00:00 2001 From: Marcelo Alcantara Date: Sat, 26 Sep 2026 09:20:37 +1000 Subject: [PATCH 3/4] omarchy-mac-boot: document the publish order the reset and key-slot entrypoints need omarchy-lifecycle-dispatch requires reset-* (#552) and luks-slots (#553) on Apple Silicon, so a runtime carrying them before this package blocks factory reset, owner setup and omarchy-drive-password on Macs. --- pkgbuilds/omarchy-mac-boot/README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgbuilds/omarchy-mac-boot/README.md b/pkgbuilds/omarchy-mac-boot/README.md index 83076db0..a7f4935e 100644 --- a/pkgbuilds/omarchy-mac-boot/README.md +++ b/pkgbuilds/omarchy-mac-boot/README.md @@ -20,6 +20,7 @@ A new pin publishes on merge, so check what the pinned source needs first: - **Settings baseline.** A pin that includes omacom/omarchy-mac#544 (no `93-omarchy-mac-plymouth.conf`) needs omarchy-settings with the HOOKS baseline (omacom/omarchy-mac#542) published on aarch64, and providing `omarchy-mkinitcpio-hooks-baseline`. Publish that first; otherwise this build cannot be installed. - **Update verification.** A pin that includes omacom/omarchy-mac#543 (`/usr/lib/omarchy/mac-boot/update-verify`) must publish before any runtime that carries #543. Otherwise that runtime blocks every update on Macs whose `omarchy-mac-boot` predates it. +- **Reset and key-slot entrypoints.** A pin that includes omacom/omarchy-mac#552 (`reset-prepare`, `reset-verify`, `reset-commit`, `reset-rollback`) and #553 (`luks-slots`) must publish before any runtime that carries them. That runtime's `omarchy-lifecycle-dispatch` requires them on Apple Silicon, so otherwise factory reset, owner setup and `omarchy-drive-password` fail on Macs whose `omarchy-mac-boot` predates them. ## Transition From c3fa2ba65d8d17ae35eb21ee306926a989c54eda Mon Sep 17 00:00:00 2001 From: Marcelo Alcantara Date: Sat, 26 Sep 2026 09:28:34 +1000 Subject: [PATCH 4/4] omarchy-mac-boot: say backup= covers /etc files, not the hook symlinks The snapshot restore hooks under /etc/boot/hooks are symlinks, which the backup list leaves out. omarchy-drive-password needs luks-slots only for the system disk. --- pkgbuilds/omarchy-mac-boot/PKGBUILD | 2 +- pkgbuilds/omarchy-mac-boot/README.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgbuilds/omarchy-mac-boot/PKGBUILD b/pkgbuilds/omarchy-mac-boot/PKGBUILD index d1e6eaaa..65ea8a65 100644 --- a/pkgbuilds/omarchy-mac-boot/PKGBUILD +++ b/pkgbuilds/omarchy-mac-boot/PKGBUILD @@ -56,7 +56,7 @@ package() { depends+=('omarchy-mkinitcpio-hooks-baseline') printf '%s\n' "$_commit" | install -Dm644 /dev/stdin "$pkgdir/usr/share/omarchy-mac/boot-source-revision" - # Administrator-editable: every /etc path and the initramfs helpers an image + # Administrator-editable: every /etc file and the initramfs helpers an image # may rewrite. mapfile -t backup < <(cd "$pkgdir" && find etc usr/lib/omarchy/initcpio -type f | sort) } diff --git a/pkgbuilds/omarchy-mac-boot/README.md b/pkgbuilds/omarchy-mac-boot/README.md index a7f4935e..269b37de 100644 --- a/pkgbuilds/omarchy-mac-boot/README.md +++ b/pkgbuilds/omarchy-mac-boot/README.md @@ -20,13 +20,13 @@ A new pin publishes on merge, so check what the pinned source needs first: - **Settings baseline.** A pin that includes omacom/omarchy-mac#544 (no `93-omarchy-mac-plymouth.conf`) needs omarchy-settings with the HOOKS baseline (omacom/omarchy-mac#542) published on aarch64, and providing `omarchy-mkinitcpio-hooks-baseline`. Publish that first; otherwise this build cannot be installed. - **Update verification.** A pin that includes omacom/omarchy-mac#543 (`/usr/lib/omarchy/mac-boot/update-verify`) must publish before any runtime that carries #543. Otherwise that runtime blocks every update on Macs whose `omarchy-mac-boot` predates it. -- **Reset and key-slot entrypoints.** A pin that includes omacom/omarchy-mac#552 (`reset-prepare`, `reset-verify`, `reset-commit`, `reset-rollback`) and #553 (`luks-slots`) must publish before any runtime that carries them. That runtime's `omarchy-lifecycle-dispatch` requires them on Apple Silicon, so otherwise factory reset, owner setup and `omarchy-drive-password` fail on Macs whose `omarchy-mac-boot` predates them. +- **Reset and key-slot entrypoints.** A pin that includes omacom/omarchy-mac#552 (`reset-prepare`, `reset-verify`, `reset-commit`, `reset-rollback`) and #553 (`luks-slots`) must publish before any runtime that carries them. That runtime's `omarchy-lifecycle-dispatch` requires them on Apple Silicon, so otherwise factory reset, owner setup and `omarchy-drive-password` on the system disk fail on Macs whose `omarchy-mac-boot` predates them. ## Transition - It provides, conflicts with and replaces `omarchy-apple-boot` and `omarchy-first-boot`. The scriptlet moves a pending `omarchy-first-boot` marker to `omarchy-mac-first-boot`, drops the replaced unit's dangling enable link and points at a customised `90-omarchy-asahi.conf.pacsave`. - `pkgver` is the UTC commit date of the pin, so any pin from `20260925` on upgrades the fork's `20260921-10` on mx-mac Macs. The files the fork shipped that the source no longer does (the image finalize tools, the upstream ARM repository key and the GRUB snapshot-menu hook) are removed by that upgrade. -- `backup=` covers every `/etc` path and `/usr/lib/omarchy/initcpio`. It includes `/etc/default/update-m1n1`, which pins update-m1n1's device-tree order to the C locale. On a Mac that already has its own unowned copy, pacman keeps it and installs the shipped one as `.pacnew`. +- `backup=` covers every `/etc` file and `/usr/lib/omarchy/initcpio`. It includes `/etc/default/update-m1n1`, which pins update-m1n1's device-tree order to the C locale. On a Mac that already has its own unowned copy, pacman keeps it and installs the shipped one as `.pacnew`. The snapshot restore hooks in `/etc/boot/hooks` are symlinks to `/usr/bin/omarchy-mac-snapshot-check`, not files, so they stay out of it. ## Updates