summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Hochstein <tom.hochstein@nxp.com>2020-01-16 10:44:21 -0600
committerOtavio Salvador <otavio@ossystems.com.br>2020-02-12 23:51:44 -0300
commit8413aafd59df1577b594e3553b767f165bb80b5e (patch)
treef584829a1f5bc455b7901e8c84547559338f9b1a
parent8e887cfcd810631680f5618b33eb0916cf995551 (diff)
downloadmeta-freescale-8413aafd59df1577b594e3553b767f165bb80b5e.tar.gz
fsl-vivante-kernel-driver-handler: Fix kernel name in variable assignment
If the graphics driver is built into the kernel, a warning is generated for each i.MX kernel recipe, like this: WARNING: /home/r60874/zeus/sources/meta-imx/meta-bsp/recipes-kernel/linux/linux-imx_5.4.bb: Variable key RPROVIDES_${KERNEL_PACKAGE_NAME}-base ( ${KERNEL_PACKAGE_NAME}-${KERNEL_VERSION}) replaces original key RPROVIDES_kernel-base ( kernel-module-imx-gpu-viv). The problem is that the kernel name used in variables is no longer a constant 'kernel', but is now parameterized: https://github.com/openembedded/openembedded-core/commit/6c8c899849d101fd1b86aad0b8eed05c7c785924 Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com>
-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 e0578f4e..8ac8a334 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-base', ' kernel-module-imx-gpu-viv') 44 e.data.appendVar('RPROVIDES_${KERNEL_PACKAGE_NAME}-base', ' kernel-module-imx-gpu-viv')
45 e.data.appendVar('RREPLACES_kernel-base', ' kernel-module-imx-gpu-viv') 45 e.data.appendVar('RREPLACES_${KERNEL_PACKAGE_NAME}-base', ' kernel-module-imx-gpu-viv')
46 e.data.appendVar('RCONFLICTS_kernel-base', ' kernel-module-imx-gpu-viv') 46 e.data.appendVar('RCONFLICTS_${KERNEL_PACKAGE_NAME}-base', ' kernel-module-imx-gpu-viv')
47} 47}
48 48
49addhandler fsl_vivante_kernel_driver_handler 49addhandler fsl_vivante_kernel_driver_handler