Skip to content

Read #14431's renamed Apple package list and pacman templates - #51

Open
ryanrhughes wants to merge 1 commit into
mainfrom
platform/aarch64-apple
Open

ryanrhughes wants to merge 1 commit into
mainfrom
platform/aarch64-apple

Conversation

@ryanrhughes

Copy link
Copy Markdown

omacom/omarchy#14431 renames the platforms to x86, aarch64 and aarch64-apple. For the image builder that moves two runtime paths it reads directly:

  • install/omarchy-apple-silicon.packages → install/omarchy-aarch64-apple.packages
  • default/pacman/apple-silicon/ → default/pacman/aarch64-apple/

Without this, build-mac-image stops with "the runtime ships no Apple package list" on any candidate set built from the renamed runtime.

What changes

  • build-mac-image, builder/candidate_set.py and builder/inspection.py take the new list and template first, then fall back to the older names, so candidate sets from older runtimes still build and inspect.
  • The image-target manifest and IMAGE still say platform=apple-silicon. The renamed runtime reads that as aarch64-apple, older runtimes only know that name, and release names and the installer app key off it. Switching the manifest to aarch64-apple can come once no supported candidate set predates the rename.
  • Tests cover the new list winning over the old one, in the shell builder and in candidate-set verification, and the runtime's aarch64-apple template winning in inspection.
  • README and docs/image-producer.md name the new paths.

Testing

  • image-builder/test/all passes (Arch x86_64 host): syntax and compile checks, test_candidate_set.py, test_inspection.py, test_mac_image_check.py, test_lab_access.py and the shell tests.
  • No image was built and nothing was run on Mac hardware.

Companion: omacom/omarchy-mac-pkgs#24. Merge both before #14431.

omacom/omarchy#14431 renames the Apple Silicon platform to aarch64-apple,
moving its package list to install/omarchy-aarch64-apple.packages and its
pacman templates to default/pacman/aarch64-apple/. The image builder and
its inspection now take those first, and still take a candidate set's older
runtime's omarchy-apple-silicon.packages or omarchy-apple.packages and its
apple-silicon or aarch64 templates.

The image still says platform=apple-silicon: the renamed runtime reads that
as aarch64-apple, and older runtimes know only that name.
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