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

WIP: esp-qcom-image: convert to OE-core uki.bbclass #722

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

koenkooi
Copy link
Contributor

This new class uses the OE-core uki.bbclass infrastructure to assemble an
ESP image with systemd-boot + UKI. It uses method #2 for config-less booting.

Systemd-boot is installed through package management, the UKI is picked
up from deploy.

Signed-off-by: Koen Kooi [email protected]
Fixes #707

@koenkooi
Copy link
Contributor Author

See qualcomm-linux/meta-qcom-hwe#138 for review and comment history

Copy link
Contributor

@ndechesne ndechesne left a comment

Choose a reason for hiding this comment

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

looks neat!


# Optional subfolder, dependant on where the ESP partition gets mounted
# intended to only have a leading slash, no trailing slash e.g. '/EFI', or just empty, ''
ESPFOLDER ?= "/EFI"
Copy link
Contributor

Choose a reason for hiding this comment

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

in which case/scenario are we expected to use ESPFOLDER? is that really needed?

Copy link
Collaborator

Choose a reason for hiding this comment

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

It should be somthing like /boot/efi by default

Copy link
Contributor Author

Choose a reason for hiding this comment

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

For non-qcom systems the ESP can be mounted in different places, e.g. /boot/efi/, in our case it's mounted directly as /boot, hence "EFI" being in the root.


UKI_CMDLINE="root=${QCOM_BOOTIMG_ROOTFS} rw rootwait"

# Remove leading 'qcom/' from KERNEL_DEVICEREE, we store the file in DEPLOY_DIR_IMAGE directly, not in the qcom/ subfolder
Copy link
Contributor

Choose a reason for hiding this comment

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

do we need to keep these 2 lines here?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The bottom one can go for sure, the top on is still needed AFAICT.

This class uses the OE-core uki.bbclass infrastructure to assemble an
ESP image with systemd-boot + UKI.

Systemd-boot is installed through package management, the UKI is picked
up from deploy.

Signed-off-by: Koen Kooi <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: In Progress
Development

Successfully merging this pull request may close these issues.

Align UKI creating with upstream OE-core
3 participants