Skip to content

Carry Snapper and first-run service fixes in ARM package builds - #12

Merged
malik-na merged 1 commit into
mainfrom
fix/arm-first-run-packages
Sep 7, 2026
Merged

malik-na merged 1 commit into
mainfrom
fix/arm-first-run-packages

Conversation

@scottjones

Copy link
Copy Markdown
Collaborator

Summary

Carry omacom/omarchy-pkgs#341 in the ARM package build pipeline, without waiting for the upstream recipes to merge.

  • Store the exact reviewed four-recipe diff as patches/omarchy-first-run-packages.patch (Snapper dependency on ARM; conditional keyboard-backlight user service installation in stable/dev settings recipes).
  • Apply it after checking out upstream definitions and before building the release pair. An already-applied patch is accepted; conflicts or partial application stop the build before any patch writes.
  • Correct the ARM publication gate: require Snapper, continue rejecting all three Limine dependencies, and require the keyboard service in systemd's user directory with matching content when the release source supplies it. Older sources without that service still work.
  • Add offline regression tests and document the carried patch and its removal condition.

Verification

  • bash scripts/self-test.sh: all 51 checks pass, including actual package-archive validation for absent Snapper, forbidden Limine dependencies, missing/stale/matching keyboard service, and older release sources.
  • Patch application, idempotence, conflict refusal without partial writes, and parsed workflow ordering are tested.
  • Carried diff compared byte-for-byte with upstream PR commit 6d27290193109c07b0134360d382e64790ae5dda.
  • Actual recipe staging on original PR base b81d678: all eight stable/dev × ARM/x86 × current Mac source/actual stable pin combinations pass using the desktop companion regression test.
  • Patch also applies cleanly and idempotently to upstream a190c0e. Its stable recipe stages successfully across ARM/x86 and current/pinned source (four cases), including matching keyboard service where applicable.
  • Latest upstream dev recipe cannot stage the older stable source pin because it now unconditionally installs plocate-updatedb.service.d/10-omarchy.conf. Reproduced without our patch; this is an independent upstream dev/old-source compatibility limitation. This repository's release workflow builds the stable pair, not the dev recipes.
  • Shell syntax and whitespace checks pass. No full ARM package build or new hardware test was run for this pipeline port.

Scope and follow-up

No release assets were published, version tags changed, or PRs merged. Existing release detection/version ordering remains unchanged; publishing these fixes still needs an appropriately versioned Mac release.

The upstream PR remains open. omacom/omarchy-mac#372 still checks out upstream recipes directly: this ARM-repository port does not automatically resolve that desktop CI dependency. CI must consume the patched recipes or wait for the upstream merge; the test should not be disabled.

@scottjones
scottjones requested a review from malik-na September 7, 2026 17:37
@malik-na
malik-na merged commit c9e2383 into main Sep 7, 2026
1 check passed
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.

2 participants