lkml.org 
[lkml]   [2015]   [Oct]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [PATCH 1/2] kconfig/merge_config.sh: Support KCONFIG_CONFIG
From
Date
Le 14/10/2015 à 12:56, Michal Marek a écrit :
> On 2015-09-09 19:33, Gabriel de Perthuis wrote:
>> All make targets support $KCONFIG_CONFIG because they
>> run scripts/kconf. Make sure merge_config.sh accesses the
>> correct file in all cases.
>>
>> Previously this script broke in two different code paths,
>> one for targets like kvmconfig (which use merge_config.sh -m
>> then call a target that respects KCONFIG_CONFIG) and one for
>> direct use of the script without -m, which called make rules
>> that edit KCONFIG_CONFIG but verified a different file.
>>
>> Signed-off-by: Gabriel de Perthuis <g2p.code@gmail.com>
>> Cc: Michal Marek <mmarek@suse.cz>
>> ---
>> scripts/kconfig/merge_config.sh | 6 +++---
>> 1 file changed, 3 insertions(+), 3 deletions(-)
>>
>> diff --git a/scripts/kconfig/merge_config.sh
>> b/scripts/kconfig/merge_config.sh
>> index 0d883b3..5f1e110 100755
>> --- a/scripts/kconfig/merge_config.sh
>> +++ b/scripts/kconfig/merge_config.sh
>> @@ -122,13 +122,13 @@ for MERGE_FILE in $MERGE_LIST ; do
>> done
>> cat $MERGE_FILE >> $TMP_FILE
>> done
>> if [ "$RUNMAKE" = "false" ]; then
>> - cp $TMP_FILE $OUTPUT/.config
>> + cp $TMP_FILE ${KCONFIG_CONFIG:=$OUTPUT/.config}
>> echo "#"
>> - echo "# merged configuration written to $OUTPUT/.config (needs make)"
>> + echo "# merged configuration written to $KCONFIG_CONFIG (needs make)"
>
> The message will not contain the name of the output file when invoked
> directly and without the variable set.

Don't miss the ${:=} assignments.

> Also, it will be more readable if you set the default value once and
then use simply $KCONFIG_CONFIG.

I'll resubmit something more explicit, pick whichever you prefer.




\
 
 \ /
  Last update: 2015-10-14 16:01    [W:1.647 / U:0.124 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site