diff options
| author | Saul Wold <sgw@linux.intel.com> | 2017-09-25 17:52:17 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-09-26 10:14:17 +0100 |
| commit | 6046b9a3d76738c459ad76f5296e7b0a54c0b2e0 (patch) | |
| tree | c68f361663f887d66ad3f7bed918f47ef1b06e91 | |
| parent | 364b3698b78e9fea59d24e3a3a5f4476be95f6d1 (diff) | |
| download | openembedded-core-6046b9a3d76738c459ad76f5296e7b0a54c0b2e0.tar.gz openembedded-core-6046b9a3d76738c459ad76f5296e7b0a54c0b2e0.tar.bz2 openembedded-core-6046b9a3d76738c459ad76f5296e7b0a54c0b2e0.zip | |
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.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/image_types_wic.bbclass | 1 | ||||
| -rw-r--r-- | 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 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" |