[OE-core] [PATCH 2/3] wic: remove systemd-boot for x32

[Khem Raj]

On Tue, Sep 19, 2017 at 11:27 AM, Saul Wold <sgw at linux.intel.com> wrote:
> 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.
>
> Signed-off-by: Saul Wold <sgw at linux.intel.com>
> ---
>  meta/classes/image_types_wic.bbclass | 1 +
>  meta/recipes-core/meta/wic-tools.bb  | 1 +
>  2 files changed, 2 insertions(+)
>
> diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass
> index b825b47ce5..b9503c69c5 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"

this will confuse with x86 ovrride. shouldnt this be x86-32 ?

>
>  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"
>
> --
> 2.11.0
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core