Skip to content

Read the Apple package list by either name - #28

Merged
maralcbr merged 1 commit into
mainfrom
mac/103-apple-silicon-packages
Sep 27, 2026
Merged

maralcbr merged 1 commit into
mainfrom
mac/103-apple-silicon-packages

Conversation

@maralcbr

Copy link
Copy Markdown
Collaborator

Upstream's convergence (omacom/omarchy#13362, next batch) names the Apple list omarchy-apple-silicon.packages; quattro-upstream ships omarchy-apple.packages today. The builder, the importer and the inspection now take whichever list the candidate runtime ships, preferring the new name, the same way #25 handled the pacman templates.

  • build-mac-image reads the list once, before the images exist, into an array the pre-check and the Apple set install both use. A link is passed over (bsdtar reads a link member as empty). A runtime with neither list, only a link, or an empty list stops the build.
  • The importer's add-on and boot package check reads the same list.
  • The inspection gains apple-packages: every package the image's Apple list names is installed.

Tested: bash image-builder/test/all and bash test/all (Bash 5) pass. New cases cover the new name, the old name, both, a compatibility link either way, neither, a link only, and an empty list, in the builder, importer and inspection tests.

Second review: no defects; wording nits applied on the omarchy-mac side.

Upstream names the Apple list omarchy-apple-silicon.packages, after the
platform; quattro-upstream still ships omarchy-apple.packages. The builder
reads whichever list the candidate runtime ships, preferring upstream's name
and passing over a link, which bsdtar reads as empty. It reads the list once,
before the images exist, and stops on a runtime with no list or an empty one.
The importer takes the same list for its add-on and boot package check, and
the inspection now checks that every package the image's Apple list names is
installed.
@maralcbr
maralcbr merged commit 7a61e0a into main Sep 27, 2026
3 checks passed
@maralcbr
maralcbr deleted the mac/103-apple-silicon-packages branch September 27, 2026 22:36
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