From baf0596c63b816e70174c5d464e0c25196d0f7f8 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Tue, 25 Jan 2022 09:55:52 -0300 Subject: fsl-vivante-kernel-driver-handler.bbclass: Fix multilib support Building core-image-weston with multilib support and builtin graphics fails: ``` ERROR: Nothing PROVIDES 'virtual/arm-oelmllib32-linux-gnueabi-binutils'. Close matches: virtual/lib32-arm-oelmllib32-linux-gnueabi-binutils virtual/lib32-arm-oelmllib32-linux-gnueabi-go-runtime virtual/lib32-arm-oelmllib32-linux-gnueabi-rust ERROR: Nothing PROVIDES 'virtual/arm-oelmllib32-linux-gnueabi-gcc'. Close matches: virtual/lib32-arm-oelmllib32-linux-gnueabi-g++ virtual/lib32-arm-oelmllib32-linux-gnueabi-gcc virtual/lib32-arm-oelmllib32-linux-gnueabi-rust ``` This is the configuration added in local.conf: ``` require conf/multilib.conf MULTILIBS = "multilib:lib32" DEFAULTTUNE:virtclass-multilib-lib32 = "armv7athf-neon" IMAGE_INSTALL:append = " lib32-glibc lib32-libgcc lib32-libstdc++" MACHINE_USES_VIVANTE_KERNEL_DRIVER_MODULE = "0" ``` This commit fixes the provides so BitBake can properly handle the dependencies. Signed-off-by: Otavio Salvador --- classes/fsl-vivante-kernel-driver-handler.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/classes/fsl-vivante-kernel-driver-handler.bbclass b/classes/fsl-vivante-kernel-driver-handler.bbclass index 54954aab..c226b0ab 100644 --- a/classes/fsl-vivante-kernel-driver-handler.bbclass +++ b/classes/fsl-vivante-kernel-driver-handler.bbclass @@ -41,9 +41,9 @@ python fsl_vivante_kernel_driver_handler () { return if use_vivante_kernel_driver_module != "1": - e.data.appendVar('RPROVIDES:${KERNEL_PACKAGE_NAME}-base', ' kernel-module-imx-gpu-viv') - e.data.appendVar('RREPLACES:${KERNEL_PACKAGE_NAME}-base', ' kernel-module-imx-gpu-viv') - e.data.appendVar('RCONFLICTS:${KERNEL_PACKAGE_NAME}-base', ' kernel-module-imx-gpu-viv') + e.data.appendVar('RPROVIDES:${KERNEL_PACKAGE_NAME}-base', ' ${MLPREFIX}kernel-module-imx-gpu-viv') + e.data.appendVar('RREPLACES:${KERNEL_PACKAGE_NAME}-base', ' ${MLPREFIX}kernel-module-imx-gpu-viv') + e.data.appendVar('RCONFLICTS:${KERNEL_PACKAGE_NAME}-base', ' ${MLPREFIX}kernel-module-imx-gpu-viv') } addhandler fsl_vivante_kernel_driver_handler -- cgit v1.2.3-54-g00ecf