diff options
| author | Chen Qi <Qi.Chen@windriver.com> | 2022-08-03 20:43:20 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-10-20 15:36:02 +0100 |
| commit | eee930bbc39c76c8ad5e1337bad0783ce0a69690 (patch) | |
| tree | 74b0a6f71bdb9d3ec5d8957762295d9711255e7a /meta | |
| parent | 18f15c7396330575281abe9f7ddee42af37976a9 (diff) | |
| download | poky-eee930bbc39c76c8ad5e1337bad0783ce0a69690.tar.gz | |
image_types_wic.bbclass: fix cross binutils dependency
Enable multilib and wic at the same time and we'll meet the
following error.
ERROR: Nothing PROVIDES 'virtual/i686-wrsmllib32-linux-binutils'
Adjust the dependency to take multilib into consideration.
(From OE-Core rev: f5713addbe47eb6c998cfe1514a537acbd367c3e)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
(cherry picked from commit 958ee0eede859bdba659e3343856b1c226207854)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/image_types_wic.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass index 5374d6125e..6453dd1b74 100644 --- a/meta/classes/image_types_wic.bbclass +++ b/meta/classes/image_types_wic.bbclass | |||
| @@ -85,7 +85,7 @@ do_image_wic[deptask] += "do_image_complete" | |||
| 85 | WKS_FILE_DEPENDS_DEFAULT = '${@bb.utils.contains_any("BUILD_ARCH", [ 'x86_64', 'i686' ], "syslinux-native", "",d)}' | 85 | WKS_FILE_DEPENDS_DEFAULT = '${@bb.utils.contains_any("BUILD_ARCH", [ 'x86_64', 'i686' ], "syslinux-native", "",d)}' |
| 86 | WKS_FILE_DEPENDS_DEFAULT += "bmap-tools-native cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native" | 86 | WKS_FILE_DEPENDS_DEFAULT += "bmap-tools-native cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native" |
| 87 | # Unified kernel images need objcopy | 87 | # Unified kernel images need objcopy |
| 88 | WKS_FILE_DEPENDS_DEFAULT += "virtual/${TARGET_PREFIX}binutils" | 88 | WKS_FILE_DEPENDS_DEFAULT += "virtual/${MLPREFIX}${TARGET_PREFIX}binutils" |
| 89 | WKS_FILE_DEPENDS_BOOTLOADERS = "" | 89 | WKS_FILE_DEPENDS_BOOTLOADERS = "" |
| 90 | WKS_FILE_DEPENDS_BOOTLOADERS:x86 = "syslinux grub-efi systemd-boot os-release" | 90 | WKS_FILE_DEPENDS_BOOTLOADERS:x86 = "syslinux grub-efi systemd-boot os-release" |
| 91 | WKS_FILE_DEPENDS_BOOTLOADERS:x86-64 = "syslinux grub-efi systemd-boot os-release" | 91 | WKS_FILE_DEPENDS_BOOTLOADERS:x86-64 = "syslinux grub-efi systemd-boot os-release" |