Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mkimage-iso-efi should always build for architecture of its tar input stream #4667

Merged
merged 1 commit into from
Mar 10, 2025

Conversation

deitch
Copy link
Contributor

@deitch deitch commented Mar 10, 2025

Previously, mkimage-iso-efi would take the tar as is, but insert initrd for its local platform, which made no sense. An earlier commit in #4665 fixed it so you could specify TARGETARCH. Thus, if running on am64 and your tar is arm64, you could force it to build for arm64 via TARGETARCH=arm64. That works, but even that is too complex.

There is no reason ever to build the initrd for anything other than the architecture of the input tar stream. Rather than trying to use local arch, or have the user signal it with an env var, this just takes the arch of the tar stream and uses it.

mkimage-iso-efi always will build the initrd for the architecture of the input stream. Much cleaner and simpler.

Kudos to @rene , who thought of this nice one.

… stream

Previously, mkimage-iso-efi would take the tar as is, but insert initrd for its local platform, which made no sense.
An earlier commit fixed it so you could specify TARGETARCH. Thus, if running on am64 and your tar is arm64, you could force it
to build for arm64 via TARGETARCH=arm64. That works, but even that is too complex.

There is no reason *ever* to build the initrd for anything other than the architecture _of the input tar stream_.
Rather than trying to use local arch, or have the user signal it with an env var, this just takes the arch of the tar stream and uses it.

mkimage-iso-efi always will build the initrd for the architecture of the input stream. Much cleaner and simpler.

Kudos to Rene Pinto, who thought of this nice one.

Signed-off-by: Avi Deitcher <[email protected]>
@deitch deitch requested a review from eriknordmark as a code owner March 10, 2025 09:46
@deitch
Copy link
Contributor Author

deitch commented Mar 10, 2025

4 eden tests failed, unclear why, so I am restarting them.

@deitch deitch merged commit 4046535 into lf-edge:master Mar 10, 2025
46 checks passed
@deitch deitch deleted the cleaner-make-efi-multi-arch branch March 10, 2025 14:26
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