diff mbox series

[v3,9/9] drm: ci: Use scripts/config to enable/disable configs

Message ID 20230908152225.432139-10-vignesh.raman@collabora.com
State Superseded
Headers show
Series drm: ci: fixes | expand

Commit Message

Vignesh Raman Sept. 8, 2023, 3:22 p.m. UTC
Instead of modifying files in git to enable/disable
configs, use scripts/config on the .config file which
will be used for building the kernel.

Suggested-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com>
---

v2:
  - Added a new patch in the series to use scripts/config to enable/disable configs

v3:
  - No changes

---
 drivers/gpu/drm/ci/build.sh | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Comments

Helen Mae Koike Fornazier Sept. 12, 2023, 5:01 p.m. UTC | #1
On 08/09/2023 12:22, Vignesh Raman wrote:
> Instead of modifying files in git to enable/disable
> configs, use scripts/config on the .config file which
> will be used for building the kernel.
> 
> Suggested-by: Jani Nikula <jani.nikula@intel.com>
> Signed-off-by: Vignesh Raman <vignesh.raman@collabora.com>

Acked-by: Helen Koike <helen.koike@collabora.com>

> ---
> 
> v2:
>    - Added a new patch in the series to use scripts/config to enable/disable configs
> 
> v3:
>    - No changes
> 
> ---
>   drivers/gpu/drm/ci/build.sh | 14 +++++++-------
>   1 file changed, 7 insertions(+), 7 deletions(-)
> 
> diff --git a/drivers/gpu/drm/ci/build.sh b/drivers/gpu/drm/ci/build.sh
> index 092c195af242..093929a115de 100644
> --- a/drivers/gpu/drm/ci/build.sh
> +++ b/drivers/gpu/drm/ci/build.sh
> @@ -70,19 +70,19 @@ if [ -z "$CI_MERGE_REQUEST_PROJECT_PATH" ]; then
>       fi
>   fi
>   
> -for opt in $ENABLE_KCONFIGS; do
> -  echo CONFIG_$opt=y >> drivers/gpu/drm/ci/${KERNEL_ARCH}.config
> -done
> -for opt in $DISABLE_KCONFIGS; do
> -  echo CONFIG_$opt=n >> drivers/gpu/drm/ci/${KERNEL_ARCH}.config
> -done
> -
>   if [[ -n "${MERGE_FRAGMENT}" ]]; then
>       ./scripts/kconfig/merge_config.sh ${DEFCONFIG} drivers/gpu/drm/ci/${MERGE_FRAGMENT}
>   else
>       make `basename ${DEFCONFIG}`
>   fi
>   
> +for opt in $ENABLE_KCONFIGS; do
> +    ./scripts/config --enable CONFIG_$opt
> +done
> +for opt in $DISABLE_KCONFIGS; do
> +    ./scripts/config --disable CONFIG_$opt
> +done
> +
>   make ${KERNEL_IMAGE_NAME}
>   
>   mkdir -p /lava-files/
diff mbox series

Patch

diff --git a/drivers/gpu/drm/ci/build.sh b/drivers/gpu/drm/ci/build.sh
index 092c195af242..093929a115de 100644
--- a/drivers/gpu/drm/ci/build.sh
+++ b/drivers/gpu/drm/ci/build.sh
@@ -70,19 +70,19 @@  if [ -z "$CI_MERGE_REQUEST_PROJECT_PATH" ]; then
     fi
 fi
 
-for opt in $ENABLE_KCONFIGS; do
-  echo CONFIG_$opt=y >> drivers/gpu/drm/ci/${KERNEL_ARCH}.config
-done
-for opt in $DISABLE_KCONFIGS; do
-  echo CONFIG_$opt=n >> drivers/gpu/drm/ci/${KERNEL_ARCH}.config
-done
-
 if [[ -n "${MERGE_FRAGMENT}" ]]; then
     ./scripts/kconfig/merge_config.sh ${DEFCONFIG} drivers/gpu/drm/ci/${MERGE_FRAGMENT}
 else
     make `basename ${DEFCONFIG}`
 fi
 
+for opt in $ENABLE_KCONFIGS; do
+    ./scripts/config --enable CONFIG_$opt
+done
+for opt in $DISABLE_KCONFIGS; do
+    ./scripts/config --disable CONFIG_$opt
+done
+
 make ${KERNEL_IMAGE_NAME}
 
 mkdir -p /lava-files/