[gnome-continuous-yocto/gnomeostree-3.28-rocko: 4378/8267] isoimage-isohybrid: use TRANSLATED_TARGET_ARCH instead of MACHINE_ARCH

[Emmanuele Bassi <ebassi src gnome org>]

commit 6740b8fdbbc639a261dc914392a4ddab7bacf6b2
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Mon Jan 16 14:23:08 2017 +0200

    isoimage-isohybrid: use TRANSLATED_TARGET_ARCH instead of MACHINE_ARCH
    
    isoimage-sihybrid plugin uses MACHINE_ARCH to get the name of initrd image.
    It doesn't work for all machines, for example for quemux86-64 machine
    MACHINE_ARCH is quemux86_64 and initrd name is
    core-image-minimal-initramfs-qemux86-64.cpio.gz
    
    Used TRANSLATED_TARGET_ARCH variable to get the initrd image name.
    Replaced MACHINE_ARCH->TRANSLATED_TARGET_ARCH in WICVARS variable to
    make it available from <image>.env file.
    
    (From OE-Core rev: edf0830412de66eada9ef3f3947ca42e301c5377)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/image-wic.bbclass                     |    4 ++--
 .../lib/wic/plugins/source/isoimage-isohybrid.py   |    8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/meta/classes/image-wic.bbclass b/meta/classes/image-wic.bbclass
index bd79073..3e98959 100644
--- a/meta/classes/image-wic.bbclass
+++ b/meta/classes/image-wic.bbclass
@@ -2,8 +2,8 @@
 # variables from this list is written to <image>.env file
 WICVARS ?= "\
            BBLAYERS IMGDEPLOYDIR DEPLOY_DIR_IMAGE FAKEROOTCMD IMAGE_BASENAME IMAGE_BOOT_FILES \
-           IMAGE_LINK_NAME IMAGE_ROOTFS INITRAMFS_FSTYPES INITRD INITRD_LIVE ISODIR MACHINE_ARCH \
-           RECIPE_SYSROOT_NATIVE ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS"
+           IMAGE_LINK_NAME IMAGE_ROOTFS INITRAMFS_FSTYPES INITRD INITRD_LIVE ISODIR RECIPE_SYSROOT_NATIVE \
+           ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS TRANSLATED_TARGET_ARCH"
 
 WKS_FILE ??= "${IMAGE_BASENAME}.${MACHINE}.wks"
 WKS_FILES ?= "${WKS_FILE} ${IMAGE_BASENAME}.wks"
diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py 
b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
index b54a229..e4637a3 100644
--- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
+++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
@@ -158,11 +158,11 @@ class IsoImagePlugin(SourcePlugin):
             if not image_type:
                 msger.error("Couldn't find INITRAMFS_FSTYPES, exiting.\n")
 
-            machine_arch = get_bitbake_var("MACHINE_ARCH")
-            if not machine_arch:
-                msger.error("Couldn't find MACHINE_ARCH, exiting.\n")
+            target_arch = get_bitbake_var("TRANSLATED_TARGET_ARCH")
+            if not target_arch:
+                msger.error("Couldn't find TRANSLATED_TARGET_ARCH, exiting.\n")
 
-            initrd = glob.glob('%s/%s*%s.%s' % (initrd_dir, image_name, machine_arch, image_type))[0]
+            initrd = glob.glob('%s/%s*%s.%s' % (initrd_dir, image_name, target_arch, image_type))[0]
 
         if not os.path.exists(initrd):
             # Create initrd from rootfs directory