Skip to content

Build omarchy-mac and omarchy-mac-boot from omarchy-mac-pkgs - #789

Merged
maralcbr merged 3 commits into
masterfrom
mac/52-pin-mac-pkgs
Oct 4, 2026
Merged

maralcbr merged 3 commits into
masterfrom
mac/52-pin-mac-pkgs

Conversation

@maralcbr

@maralcbr maralcbr commented Oct 4, 2026 •

Copy link
Copy Markdown
Collaborator

Draft, held. Don't merge yet: merging publishes both packages to edge. Merge order: merge this before omacom/omarchy#13362. The dev pair (omarchy-dev, omarchy-settings-dev) auto-publishes about 30 minutes after #13362 merges into quattro, with no maintainer step between, and that runtime needs this omarchy-mac-boot (setup-boot, update-takeover, luks-slots --owner) and this omarchy-mac (platform root, /usr/lib/omarchy/mac) already on edge. Edge's current runtime references nothing these packages drop, so publishing them first is safe. The owner merges after the E2E.

Both Mac recipes build from omacom/omarchy-mac-pkgs main at 2a3ed89 (CI green there; includes omarchy-mac-pkgs#7 docs/CI pin and #3 device tree overlays) instead of omacom/omarchy-mac. They copy the top-level omarchy-mac/ and omarchy-mac-boot/ and run each package's test/all from its own copy; neither reads the other's tree. Supersedes #672 and #673.

  • Versions: omarchy-mac 0.1.0-12, omarchy-mac-boot 20261004-2 (UTC date of the pin; pkgrel 2 because the first draft pin was the same date). vercmp puts both above edge (0.1.0-6, 20260927-1), this PR's first draft (0.1.0-11, 20261004-1), lab candidates up to 0.1.0-10 / 20260928-3, and every omarchy-mac* asset on maralcbr/omarchy-pkgs releases.
  • New in this pin: omarchy-mac-boot owns /usr/lib/omarchy-mac-boot/dtb-overlays/ (empty) for other packages' device tree overlays (omarchy-ane-dkms, Add omarchy-ane-dkms, the Apple Neural Engine driver #745); checkdepends gains dtc. With no overlay installed, boot.bin is unchanged.
  • Carried from Pin omarchy-mac to the Apple setup it took over (0.1.0-7) #672/Pin omarchy-mac-boot to the engine that repairs converted Macs (20260927-2) #673: provides/conflicts omarchy-platform; omarchy-mac depends on speakersafetyd, vulkan-asahi, asahi-alarm-keyring; omarchy-mac-boot on m1n1, uboot-asahi, asahi-alarm-keyring. Publish-order notes kept.
  • Dropped vs edge: omarchy-mac loses /usr/share/omarchy-mac/legacy/*; omarchy-mac-boot loses the migration engine (omarchy-mac-migrate, mac-boot/migrate, migrate-*.sh, omarchy-mac-migrate-verify.service). pacman removes them on upgrade; nothing in /etc is removed. The scriptlet drops the verifier's dangling enable link.
  • New on upgrade: the platform root files, /usr/lib/omarchy/mac dispatch entrypoints, and the audio watchdog user unit (vendor-enabled; its ExecCondition skips it on a runtime without omarchy-hw-apple-silicon).

Tested: CI builds both on native arm64 (check() runs each package's suite). makepkg -g checksum and vercmp checks above run in an ALARM container. End-to-end with omacom/omarchy#13362 606e33d12: see the E2E comment on #13362. Second review of the earlier pin: no blockers.

Both recipes pin omacom/omarchy-mac-pkgs main 4399105 and stage the
top-level omarchy-mac/ and omarchy-mac-boot/ directories, each tested
from its own copy. omarchy-mac 0.1.0-11 and omarchy-mac-boot 20261004-1
sort above edge and every lab candidate. They carry the depends and the
platform-root provide from #672 and #673 and drop the migration engine,
legacy files and the Apple setup core now owns.
The engine enabled omarchy-mac-migrate-verify.service with systemctl; with the unit gone the link would dangle. Also correct which omarchy-mac pull requests every omarchy-mac-pkgs pin includes (#544 has not merged).
@maralcbr

maralcbr commented Oct 4, 2026

Copy link
Copy Markdown
Collaborator Author

Review of the recipes at 0de65be (pin omacom/omarchy-mac-pkgs 4399105).

Fine: versions sort above edge and every candidate (vercmp: 0.1.0-11 > 0.1.0-6, -10, -7.1790563595; 20261004-1 > 20260927-1, 20260928-3, 20260926-1.45, 20260921-10). provides/conflicts=omarchy-platform is right, and nothing depends on it. The new depends match the payload (m1n1-aurora provides m1n1). The scriptlet's wants-link cleanup is idempotent and safe under set -e. Package suites pass on aarch64 against #13362 bf659459a (86/86, 208/208, integration 50/50).

Publish order: merge this before #13362, not after. omarchy-dev and omarchy-settings-dev watch quattro with auto_merge: true and min_release_age: 30m, so merging #13362 publishes the runtime to edge about 30 minutes later without any maintainer step. Edge omarchy-mac-boot 20260927-1 has no setup-boot or update-takeover, and its luks-slots refuses --owner. Because the dispatcher requires those, hardware setup, takeovers and drive-password changes would fail on Apple Silicon in that window. Publishing this first is harmless. Today's quattro runtime calls no dispatcher, and edge 0.1.0-6 shipped nothing under /usr/share/omarchy or any Hyprland files, so the upgrade loses nothing that runtime reads.

Notes, no change needed here:

  • Mid-migration Macs (reboot-pending): a pre_upgrade guard would not help. A failing pre_upgrade does not abort the upgrade (I tested this on pacman 7: it logs "command failed to execute correctly" and installs the new version). The in-package migration was never activated (Add Omaridian screensaver package #603), so the README note is enough.
  • These two are left to the standalone migration script: retiring the fork's /etc and WirePlumber copies (the legacy/ setup is gone), and the no_hardware_cursors block that edge omarchy-mac-setup-user appended to looknfeel.lua.
  • Nit: diffutils in omarchy-mac's depends is no longer needed. Only the tests use cmp, and checkdepends already has it.
  • If omacom/omarchy-mac-pkgs Add aarch64 build support #7 (docs, CI pin) or Fix everforest plugin to match the one specified by the theme #8 (draft: fork-only keyboard and Broadcom cleanup out of the package) merges first, re-pin.

main now has the docs and CI pin from omarchy-mac-pkgs#7 and the device
tree overlays from #3. omarchy-mac 0.1.0-12 and omarchy-mac-boot
20261004-2 (same commit date, so pkgrel 2). omarchy-mac-boot's overlay
tests need dtc in checkdepends.
@maralcbr
maralcbr marked this pull request as ready for review October 4, 2026 09:46
@maralcbr
maralcbr merged commit 46120ec into master Oct 4, 2026
7 checks passed
@github-actions

github-actions Bot commented Oct 4, 2026

Copy link
Copy Markdown
Contributor

Publish succeeded → live

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

  • edge/aarch64: omarchy-mac-0.1.0-12-aarch64, omarchy-mac-boot-20261004-2-aarch64

Some planned slots did not run because an earlier slot failed.

Commit 46120ec · 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