]> code.ossystems Code Review - openembedded-core.git/commitdiff
classes/image_live: fix using squashfs as image filesystem
authorTomasz Meresiński <tomasz.meresinski@comarch.pl>
Tue, 19 Sep 2017 10:36:00 +0000 (12:36 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 21 Sep 2017 08:24:00 +0000 (09:24 +0100)
Different squashfs versions have IMAGE_TYPE with hyphen (eg squashfs-lz4).
Tasks on the other hand have names with underscore (eg do_image_squashfs_lz4).

Signed-off-by: Tomasz Meresiński <tomasz.meresinski@comarch.pl>
Signed-off-by: Ross Burton <ross.burton@intel.com>
meta/classes/image-live.bbclass

index c1862b13195e0903d715d2e6a5a8931bcbe50540..7a388d5c6073d067a0a6fdc071324e3068109d73 100644 (file)
@@ -34,7 +34,7 @@ do_bootimg[depends] += "dosfstools-native:do_populate_sysroot \
                         ${MLPREFIX}syslinux:do_populate_sysroot \
                         syslinux-native:do_populate_sysroot \
                         ${@oe.utils.ifelse(d.getVar('COMPRESSISO', False),'zisofs-tools-native:do_populate_sysroot','')} \
-                        ${PN}:do_image_${LIVE_ROOTFS_TYPE} \
+                        ${PN}:do_image_${@d.getVar('LIVE_ROOTFS_TYPE').replace('-', '_')} \
                         "