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

Include uboot bits in installer image #4293

Merged
merged 1 commit into from
Sep 25, 2024

Conversation

deitch
Copy link
Contributor

@deitch deitch commented Sep 25, 2024

Fixes #4288

They already are added to the installer ESP, but the installer itself did not have access to them, and thus would not install them on the target disk.

The source is pkg/u-boot.

This PR adds the contents of that pkg to installer.yml as a volume, and then mounts it into the installer container, which makes it available to make-raw as /parts/boot, which then knows what to do with.

There is a bit of duplication here, but this is cleaner than alternatives.

At some point we should eliminate the installer/boot directory and make it all use what is in the installer.tar. That needs some changes to rootfs.tar, which would be beyond scope of this PR.

cc @rene

They already are added to the installer ESP, but the installer itself did not have access to them, and thus would not install them on the target disk.

Signed-off-by: Avi Deitcher <avi@deitcher.net>
Copy link
Contributor

@rene rene left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@@ -29,6 +30,9 @@ volumes:
- name: mkimage-raw-efi
image: MKRAW_TAG
readonly: true
- name: uboot
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't it ARM specific? Shouldn't we add it conditionally somehow?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nah, it is available for all platforms, even riscv64. Different content. It works on all of them.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Strange... Why do we need u-boot for x86, for example... But ok, let it be...

@deitch
Copy link
Contributor Author

deitch commented Sep 25, 2024

pull rate limits...

@deitch deitch merged commit 2d1aac4 into lf-edge:master Sep 25, 2024
46 of 70 checks passed
@deitch deitch deleted the include-boot-bits-in-installer branch September 25, 2024 16:53
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.

arm64 installer issue: files are missing at the EFI partition of the destination storage device
3 participants