Skip to content

Build settings for #13362's HOOKS baseline without a detector copy - #773

Merged
maralcbr merged 2 commits into
omacom:masterfrom
maralcbr:settings-runtime-detector
Oct 2, 2026
Merged

maralcbr merged 2 commits into
omacom:masterfrom
maralcbr:settings-runtime-detector

Conversation

@maralcbr

@maralcbr maralcbr commented Oct 2, 2026 •

Copy link
Copy Markdown
Collaborator

Summary

  • Converge omarchy-mac and omarchy-mx-mac into upstream Omarchy omarchy#13362 (d0b94d98c) dropped the omarchy-hw-platform copy omarchy-settings shipped beside its platform guard. Its 00-omarchy-hooks.conf now asks the runtime's own detector on PATH, and keeps the busybox line where there is none.

  • The aarch64 omarchy-settings and omarchy-settings-dev recipes still refuse a source whose baseline names omarchy-hw-platform without that copy, so every aarch64 build of quattro fails once #13362 merges. This removes that check. The copy is still installed when a source ships the guard, as before.

  • tests/settings-boot-config.sh: the #13362 fixture follows the PR's current baseline, and the split-layout test checks the package builds from it and ships no copy. The "refuses #13362's hooks without the platform detector" case is gone.

  • pkgrel bumps (omarchy-settings 5, omarchy-settings-dev 2) in their own commit, because the build planner only builds a recipe whose version changed (as in omarchy-settings: keep the Limine and mkinitcpio drop-ins on aarch64 #380 and omarchy-settings: ship the full set on aarch64 for runtime-profile sources #638). The packages' contents are unchanged, so drop that commit if republishing identical packages isn't wanted.

Safe to merge before or with #13362: quattro without #13362 ships no 00-omarchy-hooks.conf, so nothing it builds changes.

Test plan

  • tests/settings-boot-config.sh in a clean ubuntu:24.04 container: 11 pass, 0 fail (master: 12 pass; one case removed)
  • makepkg of both recipes for aarch64 against #13362's head (69d80cccd) on an M1 Pro: both build; the package carries the PR's baseline and no libalpm detector copy (before this change both refused)
  • The same head installed on the M1 Pro builds the Mac initramfs with base systemd ... asahi ... sd-encrypt from the runtime's detector and boots

omacom/omarchy#13362 (d0b94d98c) dropped the omarchy-hw-platform copy
omarchy-settings shipped beside its platform guard. Its 00-omarchy-hooks.conf
now asks the runtime's own detector on PATH, and keeps the busybox line where
there is none. The aarch64 settings recipes still refused any source whose
baseline names omarchy-hw-platform without that copy, so every aarch64 build
of quattro would fail once #13362 merges.

Both recipes drop that check. The copy is still installed when a source ships
the guard, as before. The test fixture follows #13362's current baseline, and
the split-layout test checks the package builds from it and ships no copy.
The build planner only builds a recipe whose version changed, so the aarch64 builds had nothing to check. The packages' contents are unchanged.
@maralcbr
maralcbr merged commit 4466021 into omacom:master Oct 2, 2026
9 checks passed
@github-actions

github-actions Bot commented Oct 2, 2026

Copy link
Copy Markdown
Contributor

Publish succeeded → live

Packages: omarchy-settings (x86_64, PR artifact); omarchy-settings (aarch64, PR artifact); omarchy-settings-dev (x86_64, PR artifact); omarchy-settings-dev (aarch64, PR artifact)

  • edge/x86_64: omarchy-settings-4.0.4-5-x86_64, omarchy-settings-dev-4.0.0.r6694.g821ae58-2-x86_64
  • edge/aarch64: omarchy-settings-4.0.4-5-aarch64, omarchy-settings-dev-4.0.0.r6694.g821ae58-2-aarch64

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

Commit 4466021 · 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