diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2023-05-15 19:37:40 +0200 |
|---|---|---|
| committer | Steve Sakoman <steve@sakoman.com> | 2023-06-14 04:14:25 -1000 |
| commit | b76003e443da464a308ff531e34a08738ac99263 (patch) | |
| tree | 4a520b658ecb0645fde5a147d48152c4c2d2bea2 /meta/classes-recipe/image-live.bbclass | |
| parent | 0fb1391bfd541d4a9d710c08b2c80671b48ffa16 (diff) | |
| download | poky-b76003e443da464a308ff531e34a08738ac99263.tar.gz | |
image-live.bbclass: respect IMAGE_MACHINE_SUFFIX
* fixes:
ERROR: core-image-minimal-1.0-r0 do_bootimg: /OE/build/poky/build/tmp/deploy/images/qemux86-64/core-image-minimal-initramfs-qemux86-64.cpio.gz is invalid. initrd image creation failed.
ERROR: core-image-minimal-1.0-r0 do_bootimg: ExecutionError('/OE/build/poky/build/tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/temp/run.build_hddimg.2001892', 1, None, None)
when IMAGE_MACHINE_SUFFIX is set to empty in local.conf
(From OE-Core rev: ac1977fea5a5d68c197d948a59447472e7c7747b)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
(cherry picked from commit ed072d2a0abe5a22330160f67ee5e83c2eae1dac)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta/classes-recipe/image-live.bbclass')
| -rw-r--r-- | meta/classes-recipe/image-live.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes-recipe/image-live.bbclass b/meta/classes-recipe/image-live.bbclass index 1034acc49e..168774a464 100644 --- a/meta/classes-recipe/image-live.bbclass +++ b/meta/classes-recipe/image-live.bbclass | |||
| @@ -38,7 +38,7 @@ do_bootimg[depends] += "dosfstools-native:do_populate_sysroot \ | |||
| 38 | LABELS_LIVE ?= "boot install" | 38 | LABELS_LIVE ?= "boot install" |
| 39 | ROOT_LIVE ?= "root=/dev/ram0" | 39 | ROOT_LIVE ?= "root=/dev/ram0" |
| 40 | INITRD_IMAGE_LIVE ?= "${MLPREFIX}core-image-minimal-initramfs" | 40 | INITRD_IMAGE_LIVE ?= "${MLPREFIX}core-image-minimal-initramfs" |
| 41 | INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.${INITRAMFS_FSTYPES}" | 41 | INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}${IMAGE_MACHINE_SUFFIX}.${INITRAMFS_FSTYPES}" |
| 42 | 42 | ||
| 43 | LIVE_ROOTFS_TYPE ?= "ext4" | 43 | LIVE_ROOTFS_TYPE ?= "ext4" |
| 44 | ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${LIVE_ROOTFS_TYPE}" | 44 | ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${LIVE_ROOTFS_TYPE}" |
