Skip to content

omarchy-mac-boot 20260925-4: re-pin to quattro-upstream 84352fdb - #646

Merged
maralcbr merged 4 commits into
masterfrom
mac/omarchy-mac-boot-repin-4
Sep 25, 2026
Merged

maralcbr merged 4 commits into
masterfrom
mac/omarchy-mac-boot-repin-4

Conversation

@maralcbr

@maralcbr maralcbr commented Sep 25, 2026 •

Copy link
Copy Markdown
Collaborator

Re-pin of omarchy-mac-boot to mainline: 20260925-4, built from omacom/omarchy-mac quattro-upstream at 84352fdb (its head, the #560 merge). It replaces the published 20260925-3 (#641, pinned to f7ea7ecc). The pin's UTC commit date is still 20260925, so per the recipe's rule pkgrel goes to 4 rather than resetting to 1 (20260925-1 would sort below -3). aarch64 and edge only, with the omarchy-platform-apple-silicon group tag.

Important

Publish order: this build must reach edge before any runtime that contains omacom/omarchy-mac#552 or #553 reaches Macs. That runtime's omarchy-lifecycle-dispatch requires reset-* and luks-slots on Apple Silicon, so factory reset, owner setup and omarchy-drive-password on the system disk fail on Macs whose omarchy-mac-boot lacks them. Nothing else in this pin needs a newer settings or runtime package.

What the new pin brings

Every boot-payload change in f7ea7ecc..84352fdb (packages/omarchy-mac/boot, 17 files):

Recipe changes

  • Pin, pkgrel and the git source checksum, as in omarchy-mac-boot 20260925-3: re-pin to quattro-upstream f7ea7ecc #641.
  • binutils dependency. The boot check and now the snapshot restore check read the kernel out of the Limine UKI with objcopy. mkinitcpio already pulls binutils in, so it changes no install.
  • README: the publish-order note above, and backup= covers /etc files: the two hook symlinks stay out of it.

Testing

  • bin/build --arch aarch64 --package omarchy-mac-boot in the aarch64 builder image: the checksum matched and check() passed (168 ok, 0 not ok, including the reset, luks-slots and snapshot-check suites). The checksum also matches git archive 84352fdb | sha256sum; the same method reproduces -3's.
  • .PKGINFO against published -3: only the version and depend = binutils differ; 20 backup entries in both; scriptlet byte-identical; vercmp orders -4 above -3.
  • pacman -Qlp -3 → -4: 83 → 92 entries, nothing removed. Added /usr/bin/omarchy-mac-snapshot-check, /usr/lib/omarchy/mac-boot/{luks-slots,reset-prepare,reset-verify,reset-commit,reset-rollback} (all 755) and /etc/boot/hooks/{pre.d/04,post.d/99}-omarchy-mac-snapshot-check (symlinks to the check). Changed: omarchy-mac-encrypt.service (a backup file; the initramfs hook rebuilds on upgrade), factory-reset.sh, provision.sh, boot-source-revision.
  • The payload is byte-identical to the pin's install staging apart from boot-source-revision.
  • namcap on -3 and -4: no new warnings apart from the usual "may not be needed" line for binutils, which it prints for every shell-tool dependency.
  • Edge's limine-snapper-sync 1.32.0-1 runs /etc/boot/hooks/<pre|post>.d/* through symlinks. Every dependency resolves on edge/aarch64 plus ALARM (asahi-scripts from asahi-alarm, as before).
  • bin/build-matrix still plans only aarch64 -> edge. PR CI is green, including the aarch64 build.

Note: the snapshot pre hook needs omarchy-hw-platform or omarchy-hw-apple-silicon to tell it's on a Mac, and without one it refuses the restore. mx-mac Macs have omarchy-hw-apple-silicon (checked on the M1 Pro); edge's stock omarchy 4.0.2-1 has neither, a gap that already affects omarchy-mac-limine-active at -3.

Second review: no defects. It independently confirmed the checksum, pkgver and head, that #544 is absent, that the package matches the install staging, that nothing is removed, the dependency and backup handling and the publish-order claim. Two wording fixes (the backup= scope and the drive-password case) are applied.

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.
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.
…ntrypoints 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.
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.
@maralcbr
maralcbr merged commit ab053e8 into master Sep 25, 2026
6 checks passed
@github-actions

Copy link
Copy Markdown
Contributor

Publish succeeded → live

Packages: omarchy-mac-boot (aarch64, PR artifact)

  • edge/aarch64: omarchy-mac-boot-20260925-4-aarch64

Commit ab053e8 · run

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant