Repository navigation
omarchy-mac-boot 20260925-3: re-pin to quattro-upstream f7ea7ecc - #641
Merged
Merged
Conversation
…n it From omacom/omarchy-mac#544 the Apple drop-ins no longer add Plymouth themselves and build on omarchy-settings' 00-omarchy-hooks.conf (#536). A settings version cannot express that (quattro candidates sort below stock releases and omarchy pins its settings exactly), so a build whose payload has no 93-omarchy-mac-plymouth.conf depends on the name omarchy-mkinitcpio-hooks-baseline, which settings packages that ship the baseline must provide.
A pin with omacom/omarchy-mac#544 needs the settings HOOKS baseline (#542) published first; a pin with #543's update-verify entrypoint must publish before any runtime carrying #543. pkgrel 3 so this rebuild does not reuse the published 20260925-2 filename.
Moves the pin from the boot-set integration commit to quattro-upstream, which now has #541 with its review fixes (first boot hands off only for a failed step, and the retry waits for NetworkManager), #543's update-verify entrypoint, #545's provision entrypoints and #549's keyslot-only LUKS check. #544 is not in it, so the Plymouth fragment still ships and no HOOKS baseline dependency applies.
maralcbr
changed the title
Contributor
This was referenced Sep 25, 2026
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
1 participant
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-3, built from omacom/omarchy-macquattro-upstreamatf7ea7ecc. It replaces the published 20260925-2 (#637, pinned to the boot-set integration commita09ee0ca). 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#543 reaches Macs. #543's update flow runs
/usr/lib/omarchy/mac-boot/update-verify, and a runtime that arrives first blocks every update on Macs whoseomarchy-mac-bootlacks it.What the new pin brings
nm-online -s)./etc/default/update-m1n1setsLC_ALL=C, and the boot check compares the device-tree set.update-verify.provision-prepare,provision-commitandprovision-verifyentrypoints.f7ea7ecc, so93-omarchy-mac-plymouth.confstill ships.Recipe changes
93-omarchy-mac-plymouth.conf.package()then adds a dependency on the nameomarchy-mkinitcpio-hooks-baseline, because that source relies on omarchy-settings'00-omarchy-hooks.conf(linux-omarchy: expose the ASUS NumberPad backlight as an LED (Zenbook 14 UX3405) #536). A settings version can't express this: quattro candidates sort below stock releases, andomarchypins its settings exactly. Settings packages that ship the baseline on aarch64 must provide that name:omarchy-settings(which also needs omarchy-settings: ship the full set on aarch64 for runtime-profile sources #638, since master's recipe still stripsmkinitcpio.conf.don aarch64),omarchy-settings-devand the candidate builder. For this pin the condition is false and no dependency is added.Testing
bin/build --arch aarch64 --package omarchy-mac-bootin a fresh builder image: the checksum matched andcheck()passed..PKGINFOshows 20260925-3, aarch64, the group tag, 21backupentries and no baseline dependency./usr/lib/omarchy/mac-boot/{provision-prepare,provision-commit,provision-verify,update-verify}are present./etc/default/update-m1n1exportsLC_ALL=C.93-omarchy-mac-plymouth.confis present.f7ea7ecc's and carries Use current trusted tooling for older PR builds #549's keyslot-section parsing.boot-source-revisionisf7ea7ecc.b4fcbd38), addsdepend = omarchy-mkinitcpio-hooks-baselineand ships no Plymouth fragment.bin/build-matrixstill plans onlyaarch64 -> edge. PR CI is green, including the aarch64 build.Second review: no defects. It independently confirmed:
makepkg -gandgit archive),pkgveragainst the pin's UTC date, and thatf7ea7eccis the head ofquattro-upstream;vercmpordering above 20260925-2;installstaging;backupfile byte-identical, with the scriptlet unchanged.