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

Ahmad Fatoum a.fatoum at pengutronix.de
Mon Mar 17 04:32:40 PDT 2025



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 at 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
> 




More information about the barebox mailing list