image-live.bbclass: Adjust the default value for INITRD_LIVE
PATCH 1/1 image-live.bbclass: Adjust the default value for INITRD_LIVE
From: Kevin Hao <[email protected]>
- After the commit 26d97acc7137 ("image-artifact-names: include ${IMAGE_NAME_SUFFIX} directly in both ${IMAGE_NAME} and ${IMAGE_LINK_NAME}"), the image names have changed from core-image-minimal-qemux86-64-20230307181808.rootfs.ext4 core-image-minimal-qemux86-64.ext4
to
core-image-minimal-qemux86-64.rootfs-20230307181456.ext4 core-image-minimal-qemux86-64.rootfs.ext4
So we also need to add ${IMAGE_NAME_SUFFIX} to the default INITRD_LIVE.
- The ${INITRAMFS_FSTYPES} may contains multi filesystem types, such as "cpio.gz cpio.xz". So it can't be used directly in setting of the default INITRD_LIVE. We choose the first filesystem type in ${INITRAMFS_FSTYPES} for the default INITRD_LIVE.
--- meta/classes-recipe/image-live.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/classes-recipe/image-live.bbclass +1 -1
@@ -38,7 +38,7 @@ do_bootimg[depends] += "dosfstools-native:do_populate_sysroot \ LABELS_LIVE ?= "boot install" ROOT_LIVE ?= "root=/dev/ram0" INITRD_IMAGE_LIVE ?= "${MLPREFIX}core-image-minimal-initramfs" -INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}${IMAGE_MACHINE_SUFFIX}.${INITRAMFS_FSTYPES}" +INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}${IMAGE_MACHINE_SUFFIX}${IMAGE_NAME_SUFFIX}.${@d.getVar('INITRAMFS_FSTYPES').split()[0]}" LIVE_ROOTFS_TYPE ?= "ext4" ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${LIVE_ROOTFS_TYPE}"
Signature · 1 line
2.40.1
Quoted 17 lines · Kevin Hao
From: Kevin Hao <[email protected]>
- After the commit
26d97acc7137("image-artifact-names: include ${IMAGE_NAME_SUFFIX} directly in both ${IMAGE_NAME} and ${IMAGE_LINK_NAME}"), the image names have changed from core-image-minimal-qemux86-64-20230307181808.rootfs.ext4 core-image-minimal-qemux86-64.ext4
to
core-image-minimal-qemux86-64.rootfs-20230307181456.ext4 core-image-minimal-qemux86-64.rootfs.ext4
So we also need to add ${IMAGE_NAME_SUFFIX} to the defaultINITRD_LIVE.- The ${INITRAMFS_FSTYPES} may contains multi filesystem types, such as "cpio.gz cpio.xz". So it can't be used directly in setting of the default
INITRD_LIVE. We choose the first filesystem type in ${INITRAMFS_FSTYPES} for the defaultINITRD_LIVE.
Quoted 4 lines
Signed-off-by Kevin Hao <[email protected]>---
meta/classes-recipe/image-live.bbclass | 2 +-1 file changed, 1 insertion(+), 1 deletion(-)
I think this causes:
https://autobuilder.yoctoproject.org/typhoon/#/builders/58/builds/8468/steps/11/logs/stdio
unfortunately.
Cheers,
Richard
Quoted 23 lines · Richard Purdie
Quoted 17 lines · Kevin Hao
From: Kevin Hao <[email protected]>
- After the commit
26d97acc7137("image-artifact-names: include ${IMAGE_NAME_SUFFIX} directly in both ${IMAGE_NAME} and ${IMAGE_LINK_NAME}"), the image names have changed from core-image-minimal-qemux86-64-20230307181808.rootfs.ext4 core-image-minimal-qemux86-64.ext4
to
core-image-minimal-qemux86-64.rootfs-20230307181456.ext4 core-image-minimal-qemux86-64.rootfs.ext4
So we also need to add ${IMAGE_NAME_SUFFIX} to the defaultINITRD_LIVE.- The ${INITRAMFS_FSTYPES} may contains multi filesystem types, such as "cpio.gz cpio.xz". So it can't be used directly in setting of the default
INITRD_LIVE. We choose the first filesystem type in ${INITRAMFS_FSTYPES} for the defaultINITRD_LIVE.Quoted 4 lines
Signed-off-by Kevin Hao <[email protected]>---
meta/classes-recipe/image-live.bbclass | 2 +-1 file changed, 1 insertion(+), 1 deletion(-)
Quoted 5 lines
I think this causes:
https://autobuilder.yoctoproject.org/typhoon/#/builders/58/builds/8468/steps/11/logs/stdio
unfortunately.
Sorry, my default. ${IMAGE_NAME_SUFFIX} shouldn't be added to INITRD_LIVE. V2 is coming.
Thanks,
Kevin