Skip to content

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 koen.kooi@oss.qualcomm.com
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!


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.

@lumag
Copy link
Contributor

lumag commented Mar 10, 2025

@koenkooi I think this is more or less ready now. Could you please squash those commits? Let's merge it, unless there are any obstacles.

@lumag
Copy link
Contributor

lumag commented Mar 28, 2025

@koenkooi ping, let's finish and merge this.

@koenkooi
Copy link
Contributor Author

@koenkooi ping, let's finish and merge this.

I've squashed and rebased it

@lumag
Copy link
Contributor

lumag commented Mar 31, 2025

@koenkooi ping, let's finish and merge this.

I've squashed and rebased it

I think it's now failing on the copyright checks. LGTM otherwise.

@koenkooi
Copy link
Contributor Author

koenkooi commented Apr 1, 2025

@koenkooi ping, let's finish and merge this.

I've squashed and rebased it

I think it's now failing on the copyright checks. LGTM otherwise.

I've added a copyright header, but I do require some feedback on that:

  1. I've used 2025 since it's a new class, but the recipe it is based on is much older, is 2025 the right year to use?
  2. I want metadata to be MIT, the original recipe is 3BSD, does this fit into the meta-qcom licensing policy?

@ricardosalveti
Copy link
Contributor

  1. I've used 2025 since it's a new class, but the recipe it is based on is much older, is 2025 the right year to use?

You could define the range, but if owned by Qualcomm just updating to the latest is fine.

  1. I want metadata to be MIT, the original recipe is 3BSD, does this fit into the meta-qcom licensing policy?

Yes, MIT is fine, that is our main license here.

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 <koen.kooi@oss.qualcomm.com>
@koenkooi koenkooi changed the title WIP: esp-qcom-image: convert to OE-core uki.bbclass esp-qcom-image: convert to OE-core uki.bbclass Apr 9, 2025
@ricardosalveti
Copy link
Contributor

@vkraleti vkraleti merged commit 3f2b8ac into qualcomm-linux:master May 8, 2025
15 checks passed
@github-project-automation github-project-automation bot moved this from In Progress to Done in Mainline Qualcomm Linux May 8, 2025
@ricardosalveti
Copy link
Contributor

Should had removed my approval, this PR is not yet fully functional, as I pasted above it fails to boot now.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Development

Successfully merging this pull request may close these issues.

Align UKI creating with upstream OE-core

5 participants