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>

diff --git a/classes/fsl-vivante-kernel-driver-handler.bbclass b/classes/fsl-vivante-kernel-driver-handler.bbclass
index 740638ac0e24f0e5b04c241d59e0fa736a858e32..cdd6450635eae509b4d7cba13cc45c4e1cc676ca 100644 (file)
--- 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
 }