Repository navigation
omarchy-mac-boot 20260925-4: re-pin to quattro-upstream 84352fdb - #646
Merged
Merged
Conversation
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.
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.
Contributor
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Re-pin of
omarchy-mac-bootto mainline: 20260925-4, built from omacom/omarchy-macquattro-upstreamat84352fdb(its head, the #560 merge). It replaces the published 20260925-3 (#641, pinned tof7ea7ecc). 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 theomarchy-platform-apple-silicongroup 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-dispatchrequiresreset-*andluks-slotson Apple Silicon, so factory reset, owner setup andomarchy-drive-passwordon the system disk fail on Macs whoseomarchy-mac-bootlacks 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):reset-prepare,reset-verify,reset-commitandreset-rollbackentrypoints; reworkedlib/factory-reset.sh(stuck factory-root binds detached, retried rollback covered);lib/provision.sh;test/mac-reset-test.sh.luks-slotsentrypoint;lib/provision.shdecides the recovery key, never keeps an unseen one, fails on an unreadable LUKS header and keepsencrypt.stateon the kept slots; install and provision tests.omarchy-mac-encrypt.servicesends its output to kmsg (StandardOutput/StandardError=kmsg) atSyslogLevel=notice, so journald forwards it; encrypt test. ([Intel Mac P08/packages] Consolidate FaceTime PCIe camera packages #556's drive-password discovery itself is runtime code.)/usr/bin/omarchy-mac-snapshot-check, linked as limine-snapper-sync's pre hook04-omarchy-mac-snapshot-checkand post hook99-omarchy-mac-snapshot-checkin/etc/boot/hooks;test/snapshot-check-test.sh.README.mddocuments the above. Publish tested daily package builder images #551, Build PR tooling from the base branch tip, not the event's base sha #554, artifact-helpers: survive bash -e #555 and [Intel Mac P11/packages] Consolidate model-specific Cirrus audio packages #557 change nothing underpackages/omarchy-mac/boot.84352fdb(still open), so93-omarchy-mac-plymouth.confstill ships and noomarchy-mkinitcpio-hooks-baselinedependency applies.Recipe changes
binutilsdependency. The boot check and now the snapshot restore check read the kernel out of the Limine UKI withobjcopy. mkinitcpio already pulls binutils in, so it changes no install.backup=covers/etcfiles: the two hook symlinks stay out of it.Testing
bin/build --arch aarch64 --package omarchy-mac-bootin the aarch64 builder image: the checksum matched andcheck()passed (168 ok, 0 not ok, including the reset, luks-slots and snapshot-check suites). The checksum also matchesgit archive 84352fdb | sha256sum; the same method reproduces -3's..PKGINFOagainst published -3: only the version anddepend = binutilsdiffer; 20backupentries in both; scriptlet byte-identical;vercmporders -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(abackupfile; the initramfs hook rebuilds on upgrade),factory-reset.sh,provision.sh,boot-source-revision.installstaging apart fromboot-source-revision.binutils, which it prints for every shell-tool dependency./etc/boot/hooks/<pre|post>.d/*through symlinks. Every dependency resolves on edge/aarch64 plus ALARM (asahi-scriptsfrom asahi-alarm, as before).bin/build-matrixstill plans onlyaarch64 -> edge. PR CI is green, including the aarch64 build.Note: the snapshot pre hook needs
omarchy-hw-platformoromarchy-hw-apple-siliconto tell it's on a Mac, and without one it refuses the restore. mx-mac Macs haveomarchy-hw-apple-silicon(checked on the M1 Pro); edge's stockomarchy4.0.2-1 has neither, a gap that already affectsomarchy-mac-limine-activeat -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.