diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2023-05-04 18:40:02 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-05-05 12:13:06 +0100 |
| commit | 76cec94fad4f5eced23751756b54d23b54ddff46 (patch) | |
| tree | 80dd7916f4fe8745b6dcbbe51bab508ac8494e26 /meta/classes-recipe | |
| parent | e53cf94d6e786d6d9094f18013f5ebca6e4bb9e7 (diff) | |
| download | poky-76cec94fad4f5eced23751756b54d23b54ddff46.tar.gz | |
image_types_wic: Remove incorrect MLPREFIX to already prefixed virtual/
Avoid dependency on unavailable virtual/lib32-arm-distromllib32-linux-gnueabi-binutils
MLPREFIX was dropped from other cases in:
https://git.openembedded.org/openembedded-core/commit/?id=6856fc5c848cc2564bebe03a007ef109f46d0adb
This was causing:
ERROR: Nothing PROVIDES 'virtual/lib32-arm-distromllib32-linux-gnueabi-binutils' (but virtual:multilib:lib32:oe-core/meta/recipes-core/images/core-image-minimal.bb DEPENDS on or otherwise requires it). Close matches:
virtual/arm-distromllib32-linux-gnueabi-binutils
virtual/lib32-arm-distromllib32-linux-gnueabi-compilerlibs
virtual/lib32-arm-distromllib32-linux-gnueabi-go-runtime
ERROR: Required build target 'lib32-core-image-minimal' has no buildable providers.
Missing or unbuildable dependency chain was: ['lib32-core-image-minimal', 'virtual/lib32-arm-distromllib32-linux-gnueabi-binutils']
in cases where multilib and WIC were enabled at the same time
(From OE-Core rev: d7644212a17537e9966218fbb99f21a64569f322)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes-recipe')
| -rw-r--r-- | meta/classes-recipe/image_types_wic.bbclass | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes-recipe/image_types_wic.bbclass b/meta/classes-recipe/image_types_wic.bbclass index c339b9bdfb..be31fbf94f 100644 --- a/meta/classes-recipe/image_types_wic.bbclass +++ b/meta/classes-recipe/image_types_wic.bbclass | |||
| @@ -91,7 +91,7 @@ do_image_wic[deptask] += "do_image_complete" | |||
| 91 | WKS_FILE_DEPENDS_DEFAULT = '${@bb.utils.contains_any("BUILD_ARCH", [ 'x86_64', 'i686' ], "syslinux-native", "",d)}' | 91 | WKS_FILE_DEPENDS_DEFAULT = '${@bb.utils.contains_any("BUILD_ARCH", [ 'x86_64', 'i686' ], "syslinux-native", "",d)}' |
| 92 | WKS_FILE_DEPENDS_DEFAULT += "bmap-tools-native cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native erofs-utils-native" | 92 | WKS_FILE_DEPENDS_DEFAULT += "bmap-tools-native cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native erofs-utils-native" |
| 93 | # Unified kernel images need objcopy | 93 | # Unified kernel images need objcopy |
| 94 | WKS_FILE_DEPENDS_DEFAULT += "virtual/${MLPREFIX}${TARGET_PREFIX}binutils" | 94 | WKS_FILE_DEPENDS_DEFAULT += "virtual/${TARGET_PREFIX}binutils" |
| 95 | WKS_FILE_DEPENDS_BOOTLOADERS = "" | 95 | WKS_FILE_DEPENDS_BOOTLOADERS = "" |
| 96 | WKS_FILE_DEPENDS_BOOTLOADERS:x86 = "syslinux grub-efi systemd-boot os-release" | 96 | WKS_FILE_DEPENDS_BOOTLOADERS:x86 = "syslinux grub-efi systemd-boot os-release" |
| 97 | WKS_FILE_DEPENDS_BOOTLOADERS:x86-64 = "syslinux grub-efi systemd-boot os-release" | 97 | WKS_FILE_DEPENDS_BOOTLOADERS:x86-64 = "syslinux grub-efi systemd-boot os-release" |