summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@arm.com>2022-07-27 12:11:55 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-08-02 11:29:59 +0100
commitaf65f0cd842a1ca3779c29a20e2160847de83c42 (patch)
treea2c5d9fe16ae73e4dfc15da3f16cbc20a21c40c1
parentc9db415375b4f2a145486052fb89adbe3d6a9ec1 (diff)
downloadpoky-af65f0cd842a1ca3779c29a20e2160847de83c42.tar.gz
wic: depend on cross-binutils
Wic can build an unified kernel image, but this needs the cross-objcopy from binutils. (From OE-Core rev: 7c7a488116f49083ca42d3628ebc0870585110c3) Signed-off-by: Ross Burton <ross.burton@arm.com> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/image_types_wic.bbclass2
-rw-r--r--meta/recipes-core/meta/wic-tools.bb1
2 files changed, 3 insertions, 0 deletions
diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass
index 79f8d93b94..940dc5f577 100644
--- a/meta/classes/image_types_wic.bbclass
+++ b/meta/classes/image_types_wic.bbclass
@@ -84,6 +84,8 @@ do_image_wic[deptask] += "do_image_complete"
84 84
85WKS_FILE_DEPENDS_DEFAULT = '${@bb.utils.contains_any("BUILD_ARCH", [ 'x86_64', 'i686' ], "syslinux-native", "",d)}' 85WKS_FILE_DEPENDS_DEFAULT = '${@bb.utils.contains_any("BUILD_ARCH", [ 'x86_64', 'i686' ], "syslinux-native", "",d)}'
86WKS_FILE_DEPENDS_DEFAULT += "bmap-tools-native cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native erofs-utils-native" 86WKS_FILE_DEPENDS_DEFAULT += "bmap-tools-native cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native erofs-utils-native"
87# Unified kernel images need objcopy
88WKS_FILE_DEPENDS_DEFAULT += "virtual/${TARGET_PREFIX}binutils"
87WKS_FILE_DEPENDS_BOOTLOADERS = "" 89WKS_FILE_DEPENDS_BOOTLOADERS = ""
88WKS_FILE_DEPENDS_BOOTLOADERS:x86 = "syslinux grub-efi systemd-boot os-release" 90WKS_FILE_DEPENDS_BOOTLOADERS:x86 = "syslinux grub-efi systemd-boot os-release"
89WKS_FILE_DEPENDS_BOOTLOADERS:x86-64 = "syslinux grub-efi systemd-boot os-release" 91WKS_FILE_DEPENDS_BOOTLOADERS:x86-64 = "syslinux grub-efi systemd-boot os-release"
diff --git a/meta/recipes-core/meta/wic-tools.bb b/meta/recipes-core/meta/wic-tools.bb
index b9580d7e33..9282d36a4d 100644
--- a/meta/recipes-core/meta/wic-tools.bb
+++ b/meta/recipes-core/meta/wic-tools.bb
@@ -7,6 +7,7 @@ DEPENDS = "\
7 mtools-native bmap-tools-native grub-native cdrtools-native \ 7 mtools-native bmap-tools-native grub-native cdrtools-native \
8 btrfs-tools-native squashfs-tools-native pseudo-native \ 8 btrfs-tools-native squashfs-tools-native pseudo-native \
9 e2fsprogs-native util-linux-native tar-native erofs-utils-native \ 9 e2fsprogs-native util-linux-native tar-native erofs-utils-native \
10 virtual/${TARGET_PREFIX}binutils \
10 " 11 "
11DEPENDS:append:x86 = " syslinux-native syslinux grub-efi systemd-boot" 12DEPENDS:append:x86 = " syslinux-native syslinux grub-efi systemd-boot"
12DEPENDS:append:x86-64 = " syslinux-native syslinux grub-efi systemd-boot" 13DEPENDS:append:x86-64 = " syslinux-native syslinux grub-efi systemd-boot"