[gnome-continuous-yocto/gnomeostree-3.28-rocko: 59/218] image-live.bbclass: add MLPREFIX to core-image-minimal-initramfs

[Emmanuele Bassi <ebassi src gnome org>]

commit 6ee061c10e4b65ca48445331dcdd645c53d12366
Author: Robert Yang <liezhi yang windriver com>
Date:   Wed Dec 13 10:45:52 2017 +0800

    image-live.bbclass: add MLPREFIX to core-image-minimal-initramfs
    
    The 32bit core-image-minimal-initramfs should be built when build lib32-iso, e.g.:
    MACHINE = "qemux86-64"
    require conf/multilib.conf
    MULTILIBS = "multilib:lib32"
    DEFAULTTUNE_virtclass-multilib-lib32 = "x86"
    IMAGE_FSTYPES += "iso"
    
    $ bitbake lib32-core-image-minimal
    Exception: FileExistsError: [Errno 17] File exists: 
'/path/to/tmp/sysroots-components/core2-64/qemuwrapper-cross/usr/bin/crossscripts/qemuwrapper' -> 
'/path/to/tmp/work/qemux86_64-pokymllib32-linux/lib32-core-image-minimal/1.0-r0/lib32-recipe-sysroot/usr/bin/crossscripts/qemuwrapper'
    
    This was because:
    lib32-core-image-minimal -> core-image-minimal-initramfs
    core-image-minimal-initramfs -> qemuwrapper-cross
    lib32-core-image-minimal -> lib32-qemuwrapper-cross
    
    So we got the error, build lib32-core-image-minimal-initramfs can fix the problem.
    
    (From OE-Core rev: 9ed77ca690d8a725f853a62801fd8dfe347f2a8e)
    
    Signed-off-by: Robert Yang <liezhi yang windriver com>
    Signed-off-by: Ross Burton <ross burton intel com>
    (cherry picked from commit eee3ec805cf150f1c701427a2d182a537a67e8f5)
    Signed-off-by: Armin Kuster <akuster808 gmail com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/image-live.bbclass                    |    2 +-
 .../images/core-image-minimal-initramfs.bb         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass
index 8ec6af0..1623c15 100644
--- a/meta/classes/image-live.bbclass
+++ b/meta/classes/image-live.bbclass
@@ -40,7 +40,7 @@ do_bootimg[depends] += "dosfstools-native:do_populate_sysroot \
 
 LABELS_LIVE ?= "boot install"
 ROOT_LIVE ?= "root=/dev/ram0"
-INITRD_IMAGE_LIVE ?= "core-image-minimal-initramfs"
+INITRD_IMAGE_LIVE ?= "${MLPREFIX}core-image-minimal-initramfs"
 INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.cpio.gz"
 
 LIVE_ROOTFS_TYPE ?= "ext4"
diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bb 
b/meta/recipes-core/images/core-image-minimal-initramfs.bb
index 5794a25..c446e87 100644
--- a/meta/recipes-core/images/core-image-minimal-initramfs.bb
+++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb
@@ -8,7 +8,7 @@ PACKAGE_INSTALL = "initramfs-live-boot initramfs-live-install initramfs-live-ins
 # Do not pollute the initrd image with rootfs features
 IMAGE_FEATURES = ""
 
-export IMAGE_BASENAME = "core-image-minimal-initramfs"
+export IMAGE_BASENAME = "${MLPREFIX}core-image-minimal-initramfs"
 IMAGE_LINGUAS = ""
 
 LICENSE = "MIT"