summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2015-12-10 14:14:35 -0200
committerOtavio Salvador <otavio@ossystems.com.br>2016-04-19 15:03:24 -0300
commit992a522b08143886d35007f774d3a24f98c1b841 (patch)
tree5a9a2c4e70cce9c6ad20162883108e4f61cbb42a
parentee8b9ad49aecf54b21a3e068f21b9dd0088d074c (diff)
downloadmeta-freescale-992a522b08143886d35007f774d3a24f98c1b841.tar.gz
fsl-vivante-kernel-driver-handler.bbclass: Postpone defconfig changes
The defconfig changes should be done later in the process so the .config file is generated, using any other mean, and mangled to respect the distribution setting regarding the module use or not. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r--classes/fsl-vivante-kernel-driver-handler.bbclass14
1 files changed, 6 insertions, 8 deletions
diff --git a/classes/fsl-vivante-kernel-driver-handler.bbclass b/classes/fsl-vivante-kernel-driver-handler.bbclass
index 740638ac..cdd64506 100644
--- a/classes/fsl-vivante-kernel-driver-handler.bbclass
+++ b/classes/fsl-vivante-kernel-driver-handler.bbclass
@@ -49,17 +49,15 @@ python fsl_vivante_kernel_driver_handler () {
49addhandler fsl_vivante_kernel_driver_handler 49addhandler fsl_vivante_kernel_driver_handler
50fsl_vivante_kernel_driver_handler[eventmask] = "bb.event.RecipePreFinalise" 50fsl_vivante_kernel_driver_handler[eventmask] = "bb.event.RecipePreFinalise"
51 51
52do_configure_prepend () { 52do_configure_append () {
53 if [ "${MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT}" = "1" ]; then 53 if [ "${MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT}" = "1" ]; then
54 fsl_viv_handler_defconfig="${WORKDIR}/defconfig" 54 config="${B}/.config"
55 if [ -e ${B}/.config ]; then 55
56 fsl_viv_handler_defconfig="${B}/.config" 56 sed -i "/CONFIG_MXC_GPU_VIV[ =]/d" $config
57 fi
58 sed -i "/CONFIG_MXC_GPU_VIV[ =]/d" $fsl_viv_handler_defconfig
59 if [ "${MACHINE_USES_VIVANTE_KERNEL_DRIVER_MODULE}" = "1" ]; then 57 if [ "${MACHINE_USES_VIVANTE_KERNEL_DRIVER_MODULE}" = "1" ]; then
60 echo "# CONFIG_MXC_GPU_VIV is not set" >> $fsl_viv_handler_defconfig 58 echo "# CONFIG_MXC_GPU_VIV is not set" >> $config
61 else 59 else
62 echo "CONFIG_MXC_GPU_VIV=y" >> $fsl_viv_handler_defconfig 60 echo "CONFIG_MXC_GPU_VIV=y" >> $config
63 fi 61 fi
64 fi 62 fi
65} 63}