[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7904/8267] wic: remove systemd-boot for x32

[Emmanuele Bassi <ebassi src gnome org>]

commit f0f2b2369e2883b50907c4f7e2973dfa23b765a5
Author: Saul Wold <sgw linux intel com>
Date:   Mon Sep 25 17:52:17 2017 -0700

    wic: remove systemd-boot for x32
    
    Currently systemd-boot actually incorporates libgcc, since the
    systemd-boot needs to be built with 64bit instructions it can not
    use the x32 based libgcc.
    
    Use the new override to ensure it gets overriden, linux-gnux32 could
    not be used because x86-64 has higher priority.
    
    (From OE-Core rev: 6046b9a3d76738c459ad76f5296e7b0a54c0b2e0)
    
    Signed-off-by: Saul Wold <sgw linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/classes/image_types_wic.bbclass |    1 +
 meta/recipes-core/meta/wic-tools.bb  |    1 +
 2 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass
index e60dca7..222ae00 100644
--- a/meta/classes/image_types_wic.bbclass
+++ b/meta/classes/image_types_wic.bbclass
@@ -45,6 +45,7 @@ WKS_FILE_DEPENDS_DEFAULT = "syslinux-native bmap-tools-native cdrtools-native bt
 WKS_FILE_DEPENDS_BOOTLOADERS = ""
 WKS_FILE_DEPENDS_BOOTLOADERS_x86 = "syslinux grub-efi systemd-boot"
 WKS_FILE_DEPENDS_BOOTLOADERS_x86-64 = "syslinux grub-efi systemd-boot"
+WKS_FILE_DEPENDS_BOOTLOADERS_x86-x32 = "syslinux grub-efi"
 
 WKS_FILE_DEPENDS ??= "${WKS_FILE_DEPENDS_DEFAULT} ${WKS_FILE_DEPENDS_BOOTLOADERS}"
 
diff --git a/meta/recipes-core/meta/wic-tools.bb b/meta/recipes-core/meta/wic-tools.bb
index 57dd37a..09eb409 100644
--- a/meta/recipes-core/meta/wic-tools.bb
+++ b/meta/recipes-core/meta/wic-tools.bb
@@ -10,6 +10,7 @@ DEPENDS = "\
            "
 DEPENDS_append_x86 = " syslinux grub-efi systemd-boot"
 DEPENDS_append_x86-64 = " syslinux grub-efi systemd-boot"
+DEPENDS_append_x86-x32 = " syslinux grub-efi"
 
 INHIBIT_DEFAULT_DEPS = "1"