[gnome-continuous-yocto/gnomeostree-3.28-rocko: 6078/8267] isoimage-isohybrid: don't use TRANSLATED_TARGET_ARCH

[Emmanuele Bassi <ebassi src gnome org>]

commit 684534198f53c8c9b550d5a75787d8dd28d284ed
Author: Ed Bartosh <ed bartosh linux intel com>
Date:   Wed May 17 12:49:12 2017 +0000

    isoimage-isohybrid: don't use TRANSLATED_TARGET_ARCH
    
    isoimage-isohybrid plugin fails with this error when
    trying to find initrd image:
        initrd = glob.glob('%s/%s*%s.%s' % (initrd_dir, image_name, target_arch, image_type))[0]
        IndexError: list index out of range
    as it uses TRANSLATED_TARGET_ARCH value as part of the image.
    This approach stopped to work due to changes in oe core code.
    
    initrd file name is made using MACHINE variable. wic can't get value
    of this variable as it's not included into bitbake -e output.
    
    Used basename of deploy dir as MACHINE value to fix the breakage.
    
    (From OE-Core rev: cfbb3cc1279ea88ca3e2867f8a409c5120aa1f05)
    
    (From OE-Core rev: e26fa1c34c33ffdc678f8073dade0126aff08b40)
    
    Signed-off-by: Ed Bartosh <ed bartosh linux intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/image_types_wic.bbclass               |    2 +-
 .../lib/wic/plugins/source/isoimage-isohybrid.py   |    6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)
---
diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass
index 4711c24..5cd1c08 100644
--- a/meta/classes/image_types_wic.bbclass
+++ b/meta/classes/image_types_wic.bbclass
@@ -3,7 +3,7 @@
 WICVARS ?= "\
            BBLAYERS IMGDEPLOYDIR DEPLOY_DIR_IMAGE FAKEROOTCMD IMAGE_BASENAME IMAGE_BOOT_FILES \
            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"
+           ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS"
 
 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 1ceba62..b464263 100644
--- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
+++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
@@ -162,11 +162,9 @@ class IsoImagePlugin(SourcePlugin):
             if not image_type:
                 raise WicError("Couldn't find INITRAMFS_FSTYPES, exiting.")
 
-            target_arch = get_bitbake_var("TRANSLATED_TARGET_ARCH")
-            if not target_arch:
-                raise WicError("Couldn't find TRANSLATED_TARGET_ARCH, exiting.")
+            machine = os.path.basename(initrd_dir)
 
-            initrd = glob.glob('%s/%s*%s.%s' % (initrd_dir, image_name, target_arch, image_type))[0]
+            initrd = glob.glob('%s/%s*%s.%s' % (initrd_dir, image_name, machine, image_type))[0]
 
         if not os.path.exists(initrd):
             # Create initrd from rootfs directory