From 992a522b08143886d35007f774d3a24f98c1b841 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Thu, 10 Dec 2015 14:14:35 -0200 Subject: [PATCH] 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 --- classes/fsl-vivante-kernel-driver-handler.bbclass | 14 ++++++-------- 1 file 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 () { addhandler fsl_vivante_kernel_driver_handler fsl_vivante_kernel_driver_handler[eventmask] = "bb.event.RecipePreFinalise" -do_configure_prepend () { +do_configure_append () { if [ "${MACHINE_HAS_VIVANTE_KERNEL_DRIVER_SUPPORT}" = "1" ]; then - fsl_viv_handler_defconfig="${WORKDIR}/defconfig" - if [ -e ${B}/.config ]; then - fsl_viv_handler_defconfig="${B}/.config" - fi - sed -i "/CONFIG_MXC_GPU_VIV[ =]/d" $fsl_viv_handler_defconfig + config="${B}/.config" + + sed -i "/CONFIG_MXC_GPU_VIV[ =]/d" $config if [ "${MACHINE_USES_VIVANTE_KERNEL_DRIVER_MODULE}" = "1" ]; then - echo "# CONFIG_MXC_GPU_VIV is not set" >> $fsl_viv_handler_defconfig + echo "# CONFIG_MXC_GPU_VIV is not set" >> $config else - echo "CONFIG_MXC_GPU_VIV=y" >> $fsl_viv_handler_defconfig + echo "CONFIG_MXC_GPU_VIV=y" >> $config fi fi } -- 2.40.1