]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core.git/commitdiff
image-live.bbclass: LIVE_ROOTFS_TYPE support compression
authorLudovic Jozeau <ludovic.jozeau@smile.fr>
Thu, 21 Dec 2023 14:24:21 +0000 (15:24 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sat, 23 Dec 2023 08:43:38 +0000 (08:43 +0000)
The task for fstypes with compression is the same as the task for the
uncompressed fstypes, e.g. when adding tar.xz to `IMAGE_FSTYPES`, it will
be included into the do_image_tar task and not creating a separate
do_image_tar.xz task.

This commit fixes `LIVE_ROOTFS_TYPE` with compressed fstypes by
depending on the actual task instead of the non-existent
do_image_<fstype>.<compression> task.

Fixes [YOCTO #15331]

Signed-off-by: Ludovic Jozeau <ludovic.jozeau@smile.fr>
Reviewed-by: Yoann Congal <yoann.congal@smile.fr>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes-recipe/image-live.bbclass

index 95dd44a8c08ae1fbd6bc3cee9262c8afa7d9eeae..da919d52f983e9cf8ab9dda506b8e5ceeeb5be66 100644 (file)
@@ -31,7 +31,7 @@ do_bootimg[depends] += "dosfstools-native:do_populate_sysroot \
                         virtual/kernel:do_deploy \
                         ${MLPREFIX}syslinux:do_populate_sysroot \
                         syslinux-native:do_populate_sysroot \
-                        ${@'%s:do_image_%s' % (d.getVar('PN'), d.getVar('LIVE_ROOTFS_TYPE').replace('-', '_')) if d.getVar('ROOTFS') else ''} \
+                        ${@'%s:do_image_%s' % (d.getVar('PN'), d.getVar('LIVE_ROOTFS_TYPE').replace('-', '_').split('.')[0]) if d.getVar('ROOTFS') else ''} \
                         "