From f0f2b2369e2883b50907c4f7e2973dfa23b765a5 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Mon, 25 Sep 2017 17:52:17 -0700 Subject: 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 Signed-off-by: Richard Purdie --- meta/classes/image_types_wic.bbclass | 1 + meta/recipes-core/meta/wic-tools.bb | 1 + 2 files changed, 2 insertions(+) (limited to 'meta') diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass index e60dca7237..222ae00433 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 57dd37a440..09eb409e87 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" -- cgit v1.2.3-54-g00ecf