From: Tomasz Meresiński <tomasz.meresinski@comarch.pl>
Date: Tue, 19 Sep 2017 10:36:00 +0000 (+0200)
Subject: classes/image_live: fix using squashfs as image filesystem
X-Git-Tag: 2017-10~132
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=ab3cdfbd24844506647b75002f531b0b82b87be4;p=openembedded-core.git

classes/image_live: fix using squashfs as image filesystem

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>
---

diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
index c1862b1319..7a388d5c60 100644
--- a/meta/classes/image-live.bbclass
+++ b/meta/classes/image-live.bbclass
@@ -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('-', '_')} \
                         "