summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2022-01-25 09:55:52 -0300
committerTom Hochstein <tom.hochstein@nxp.com>2022-01-25 15:43:53 -0600
commitd59a36af0e03ebdc8ccc30af4b4fa9f3308566b2 (patch)
treed42d9f6cf86a2666510a48e9dcc29af375093d79
parenta5448e0e60ae1f388b7ab6bd6a8d730f5a6a38ae (diff)
downloadmeta-freescale-d59a36af0e03ebdc8ccc30af4b4fa9f3308566b2.tar.gz
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 <otavio@ossystems.com.br> (cherry picked from commit baf0596c63b816e70174c5d464e0c25196d0f7f8)
-rw-r--r--classes/fsl-vivante-kernel-driver-handler.bbclass6
1 files 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 () {
41 return 41 return
42 42
43 if use_vivante_kernel_driver_module != "1": 43 if use_vivante_kernel_driver_module != "1":
44 e.data.appendVar('RPROVIDES:${KERNEL_PACKAGE_NAME}-base', ' kernel-module-imx-gpu-viv') 44 e.data.appendVar('RPROVIDES:${KERNEL_PACKAGE_NAME}-base', ' ${MLPREFIX}kernel-module-imx-gpu-viv')
45 e.data.appendVar('RREPLACES:${KERNEL_PACKAGE_NAME}-base', ' kernel-module-imx-gpu-viv') 45 e.data.appendVar('RREPLACES:${KERNEL_PACKAGE_NAME}-base', ' ${MLPREFIX}kernel-module-imx-gpu-viv')
46 e.data.appendVar('RCONFLICTS:${KERNEL_PACKAGE_NAME}-base', ' kernel-module-imx-gpu-viv') 46 e.data.appendVar('RCONFLICTS:${KERNEL_PACKAGE_NAME}-base', ' ${MLPREFIX}kernel-module-imx-gpu-viv')
47} 47}
48 48
49addhandler fsl_vivante_kernel_driver_handler 49addhandler fsl_vivante_kernel_driver_handler