From: Martin Jansa Date: Thu, 4 May 2023 16:40:02 +0000 (+0200) Subject: image_types_wic: Remove incorrect MLPREFIX to already prefixed virtual/ X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~1003 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d7644212a17537e9966218fbb99f21a64569f322;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git 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 Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- diff --git a/meta/classes-recipe/image_types_wic.bbclass b/meta/classes-recipe/image_types_wic.bbclass index c339b9bdfb4..be31fbf94fe 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" WKS_FILE_DEPENDS_DEFAULT = '${@bb.utils.contains_any("BUILD_ARCH", [ 'x86_64', 'i686' ], "syslinux-native", "",d)}' WKS_FILE_DEPENDS_DEFAULT += "bmap-tools-native cdrtools-native btrfs-tools-native squashfs-tools-native e2fsprogs-native erofs-utils-native" # Unified kernel images need objcopy -WKS_FILE_DEPENDS_DEFAULT += "virtual/${MLPREFIX}${TARGET_PREFIX}binutils" +WKS_FILE_DEPENDS_DEFAULT += "virtual/${TARGET_PREFIX}binutils" WKS_FILE_DEPENDS_BOOTLOADERS = "" WKS_FILE_DEPENDS_BOOTLOADERS:x86 = "syslinux grub-efi systemd-boot os-release" WKS_FILE_DEPENDS_BOOTLOADERS:x86-64 = "syslinux grub-efi systemd-boot os-release"