| Message ID | 20260120024313.3467088-1-dmitry.baryshkov@oss.qualcomm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] uki.bbclass: fix building of UKI images with multiple initramfs fstypes | expand |
On Tue, 2026-01-20 at 04:43 +0200, Dmitry Baryshkov via lists.openembedded.org wrote: > If INITRAMFS_FSTYPES contains more than one entry, ukify build command > will fail as INITRD_ARCHIVE will contain extra strings. Use only the > first initramfs type, letting the user to specify other fstypes in > INITRAMFS_FSTYPES. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> Hi Dmitry, The implementation now looks good. The commit message needs a little rewording, we need to note that INITRD_ARCHIVE is now gone so that it's easier to notice this change when we're compiling release notes. Best regards,
diff --git a/meta/classes-recipe/uki.bbclass b/meta/classes-recipe/uki.bbclass index a2b1c8a82d6f..ea449540db66 100644 --- a/meta/classes-recipe/uki.bbclass +++ b/meta/classes-recipe/uki.bbclass @@ -73,8 +73,6 @@ require ../conf/image-uefi.conf INITRAMFS_IMAGE ?= "core-image-minimal-initramfs" -INITRD_ARCHIVE ?= "${INITRAMFS_IMAGE}-${MACHINE}.${INITRAMFS_FSTYPES}" - do_image_complete[depends] += "${INITRAMFS_IMAGE}:do_image_complete" UKIFY_CMD ?= "ukify build" @@ -127,7 +125,8 @@ python do_uki() { ukify_cmd += " --stub %s" % (stub) # initrd - initramfs_image = "%s" % (d.getVar('INITRD_ARCHIVE')) + uki_fstype = d.getVar("INITRAMFS_FSTYPES").split()[0] + initramfs_image = "%s-%s.%s" % (d.getVar('INITRAMFS_IMAGE'), d.getVar('MACHINE'), uki_fstype) ukify_cmd += " --initrd=%s" % (os.path.join(deploy_dir_image, initramfs_image)) # kernel
If INITRAMFS_FSTYPES contains more than one entry, ukify build command will fail as INITRD_ARCHIVE will contain extra strings. Use only the first initramfs type, letting the user to specify other fstypes in INITRAMFS_FSTYPES. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> --- meta/classes-recipe/uki.bbclass | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)