[PATCH 1/2] MAKEALL: support direct options for KCONFIG_ADD

[PATCH 1/2] MAKEALL: support direct options for KCONFIG_ADD

[Ahmad Fatoum]

KCONFIG_ADD currently expects a list of files to be merged.
As MAKEALL is a bash script, let's make use of process substitution
to create temporary files out of -k CONFIG_foo=bar options.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 MAKEALL | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/MAKEALL b/MAKEALL
index 1966eedb4673..b0967b8ae340 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -56,7 +56,7 @@ usage() {
 	echo "BUILDDIR    -O      build dir"
 	echo "LOGDIR      -l      log dir"
 	echo "REGEX       -e      regex"
-	echo "KCONFIG_ADD -k      kconfig fragment"
+	echo "KCONFIG_ADD -k      kconfig fragment or option"
 	echo "TARGET      -t      Makefile target"
 	echo "V           -v      verbosity"
 	echo "INCREMENTAL -i"
@@ -116,6 +116,11 @@ report() {
 	fi
 }
 
+merge_config() {
+	with_logs_collected ./scripts/kconfig/merge_config.sh -m -O \
+		${BUILDDIR} "$@"
+}
+
 do_build_defconfig() {
 	local arch=$1
 	local defconfig=$2
@@ -156,8 +161,11 @@ do_build_defconfig() {
 	MAKE="${MAKE} $silent_flag CROSS_COMPILE=${cross_compile}"
 	with_logs_collected ${MAKE} ${defconfig}
 	for i in ${KCONFIG_ADD}; do
-		with_logs_collected ./scripts/kconfig/merge_config.sh -m -O \
-			${BUILDDIR} ${BUILDDIR}/.config $i
+		if [[ $i =~ ^CONFIG_* ]]; then
+			merge_config ${BUILDDIR}/.config <(echo $i)
+		else
+			merge_config ${BUILDDIR}/.config $i
+		fi
 	done
 	with_logs_collected ${MAKE} $silent_flag olddefconfig
 
-- 
2.39.5

[PATCH 2/2] MAKEALL: parse kconfig_add out of YAML files

[Ahmad Fatoum]

Now that MAKEALL supports direct options in KCONFIG_ADD, teach it to
read runner kconfig_add keys out of the labgrid environment YAML files.

This is a further step towards removal of test/emulate.pl.

Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
---
 MAKEALL            | 13 +++++++++++++
 test/Containerfile |  1 +
 2 files changed, 14 insertions(+)

diff --git a/MAKEALL b/MAKEALL
index b0967b8ae340..636621d9faec 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -422,6 +422,19 @@ else
 		if [[ $i =~ ^.*/([^/]+)/([^@]*@|)([^.]+).yaml$ ]]; then
 			arch=${BASH_REMATCH[1]}
 			defconfig=${BASH_REMATCH[3]}
+
+			if grep -q "^\s\+kconfig_add:" $i; then
+				if command -v yq 2>&1 >/dev/null; then
+					KCONFIG_ADD="${KCONFIG_ADD} $(yq -M -r \
+					'.targets.main.runner.kconfig_add |
+					keys[] as $k | .[$k]' < $i)"
+				else
+					echo "WARNING: yq command not found in path" >&2
+					echo "WARNING: ignoring kconfig_add in $i" >&2
+					echo
+				fi
+			fi
+
 			do_build_defconfig $arch $defconfig
 			if [ $? -eq 0 ]; then
 				do_test_defconfig $config $defconfig "${pytest_opts[@]}"
diff --git a/test/Containerfile b/test/Containerfile
index db43d039b922..53a5443e48fe 100644
--- a/test/Containerfile
+++ b/test/Containerfile
@@ -51,6 +51,7 @@ RUN apt-get update && apt-get install -y \
 	sudo \
 	u-boot-tools \
 	yamllint \
+	yq \
 	&& rm -rf /var/lib/apt/lists/*
 
 ENV GCC_VERSION=14.2.0
-- 
2.39.5

Re: [PATCH 1/2] MAKEALL: support direct options for KCONFIG_ADD

[Sascha Hauer]

On Thu, Mar 13, 2025 at 12:36:03PM +0100, Ahmad Fatoum wrote:
> KCONFIG_ADD currently expects a list of files to be merged.
> As MAKEALL is a bash script, let's make use of process substitution
> to create temporary files out of -k CONFIG_foo=bar options.
> 
> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
> ---
>  MAKEALL | 14 +++++++++++---
>  1 file changed, 11 insertions(+), 3 deletions(-)
> 
> diff --git a/MAKEALL b/MAKEALL
> index 1966eedb4673..b0967b8ae340 100755
> --- a/MAKEALL
> +++ b/MAKEALL
> @@ -56,7 +56,7 @@ usage() {
>  	echo "BUILDDIR    -O      build dir"
>  	echo "LOGDIR      -l      log dir"
>  	echo "REGEX       -e      regex"
> -	echo "KCONFIG_ADD -k      kconfig fragment"
> +	echo "KCONFIG_ADD -k      kconfig fragment or option"
>  	echo "TARGET      -t      Makefile target"
>  	echo "V           -v      verbosity"
>  	echo "INCREMENTAL -i"
> @@ -116,6 +116,11 @@ report() {
>  	fi
>  }
>  
> +merge_config() {
> +	with_logs_collected ./scripts/kconfig/merge_config.sh -m -O \
> +		${BUILDDIR} "$@"
> +}
> +
>  do_build_defconfig() {
>  	local arch=$1
>  	local defconfig=$2
> @@ -156,8 +161,11 @@ do_build_defconfig() {
>  	MAKE="${MAKE} $silent_flag CROSS_COMPILE=${cross_compile}"
>  	with_logs_collected ${MAKE} ${defconfig}
>  	for i in ${KCONFIG_ADD}; do
> -		with_logs_collected ./scripts/kconfig/merge_config.sh -m -O \
> -			${BUILDDIR} ${BUILDDIR}/.config $i
> +		if [[ $i =~ ^CONFIG_* ]]; then

'_*' matches zero or more underscores which is likely not what you mean
here.

How about ^CONFIG_.*=.* which also tests for the equal sign.

Sascha

-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Re: [PATCH 1/2] MAKEALL: support direct options for KCONFIG_ADD

[Ahmad Fatoum]

On 3/17/25 10:21, Sascha Hauer wrote:
> On Thu, Mar 13, 2025 at 12:36:03PM +0100, Ahmad Fatoum wrote:
>> KCONFIG_ADD currently expects a list of files to be merged.
>> As MAKEALL is a bash script, let's make use of process substitution
>> to create temporary files out of -k CONFIG_foo=bar options.
>>
>> Signed-off-by: Ahmad Fatoum <a.fatoum@pengutronix.de>
>> ---
>>  MAKEALL | 14 +++++++++++---
>>  1 file changed, 11 insertions(+), 3 deletions(-)
>>
>> diff --git a/MAKEALL b/MAKEALL
>> index 1966eedb4673..b0967b8ae340 100755
>> --- a/MAKEALL
>> +++ b/MAKEALL
>> @@ -56,7 +56,7 @@ usage() {
>>  	echo "BUILDDIR    -O      build dir"
>>  	echo "LOGDIR      -l      log dir"
>>  	echo "REGEX       -e      regex"
>> -	echo "KCONFIG_ADD -k      kconfig fragment"
>> +	echo "KCONFIG_ADD -k      kconfig fragment or option"
>>  	echo "TARGET      -t      Makefile target"
>>  	echo "V           -v      verbosity"
>>  	echo "INCREMENTAL -i"
>> @@ -116,6 +116,11 @@ report() {
>>  	fi
>>  }
>>  
>> +merge_config() {
>> +	with_logs_collected ./scripts/kconfig/merge_config.sh -m -O \
>> +		${BUILDDIR} "$@"
>> +}
>> +
>>  do_build_defconfig() {
>>  	local arch=$1
>>  	local defconfig=$2
>> @@ -156,8 +161,11 @@ do_build_defconfig() {
>>  	MAKE="${MAKE} $silent_flag CROSS_COMPILE=${cross_compile}"
>>  	with_logs_collected ${MAKE} ${defconfig}
>>  	for i in ${KCONFIG_ADD}; do
>> -		with_logs_collected ./scripts/kconfig/merge_config.sh -m -O \
>> -			${BUILDDIR} ${BUILDDIR}/.config $i
>> +		if [[ $i =~ ^CONFIG_* ]]; then
> 
> '_*' matches zero or more underscores which is likely not what you mean
> here.
> 
> How about ^CONFIG_.*=.* which also tests for the equal sign.

Sounds good. Please see v2 that I just sent out.

> 
> Sascha
>