[meta-fsl-arm][PATCH] fsl-vivante-kernel-driver-handler.bbclass: Fix kernel config when graphics kernel module config is changed

* [meta-fsl-arm][PATCH] fsl-vivante-kernel-driver-handler.bbclass: Fix kernel config when graphics kernel module config is changed
@ 2015-11-25 22:06 Tom Hochstein
  2015-11-26 11:37 ` Otavio Salvador
  0 siblings, 1 reply; 5+ messages in thread
From: Tom Hochstein @ 2015-11-25 22:06 UTC (permalink / raw)
  To: meta-freescale

Changes to the kernel config can only be applied to the defconfig since
the do_configure_prepend in fsl-kernel-localversion.bbclass throws away
the build/.config file.

Signed-off-by: Tom Hochstein <tom.hochstein@freescale.com>
---
 classes/fsl-vivante-kernel-driver-handler.bbclass | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/classes/fsl-vivante-kernel-driver-handler.bbclass b/classes/fsl-vivante-kernel-driver-handler.bbclass
index 740638a..0890cdd 100644
--- a/classes/fsl-vivante-kernel-driver-handler.bbclass
+++ b/classes/fsl-vivante-kernel-driver-handler.bbclass
@@ -51,15 +51,11 @@ fsl_vivante_kernel_driver_handler[eventmask] = "bb.event.RecipePreFinalise"
 
 do_configure_prepend () {
     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
         if [ "${MACHINE_USES_VIVANTE_KERNEL_DRIVER_MODULE}" = "1" ]; then
-            echo "# CONFIG_MXC_GPU_VIV is not set" >> $fsl_viv_handler_defconfig
+            new_config="# CONFIG_MXC_GPU_VIV is not set"
         else
-            echo "CONFIG_MXC_GPU_VIV=y" >> $fsl_viv_handler_defconfig
+            new_config="CONFIG_MXC_GPU_VIV=y"
         fi
+        sed -i "s/.*CONFIG_MXC_GPU_VIV.*/$new_config/g" ${WORKDIR}/defconfig
     fi
 }
-- 
2.1.4



^ permalink raw reply related	[flat|nested] 5+ messages in thread