[yocto-kernel-tools] tools/kconf_check: modify grep pattern

Submitted by Hongzhi.Song on Dec. 11, 2018, 10:12 a.m. | Patch ID: 157016

Details

Message ID 1544523170-221209-1-git-send-email-hongzhi.song@windriver.com
State New
Headers show

Commit Message

Hongzhi.Song Dec. 11, 2018, 10:12 a.m.
The cmd line, <grep '^[  ]*\(menu\)*config '>, can't
match all expect config options.

This is because that it is not always space after 'config'
in kernel-source/*/.../Kconfig.
e.g. "config  IP_VS_IPV6" in net/netfilter/ipvs/Kconfig

So we should change the cmd to grep '^[  ]*\(menu\)*config\s'.

Signed-off-by: Hongzhi.Song <hongzhi.song@windriver.com>
---
 tools/kconf_check | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox

diff --git a/tools/kconf_check b/tools/kconf_check
index aa86180..20b49cd 100755
--- a/tools/kconf_check
+++ b/tools/kconf_check
@@ -241,7 +241,7 @@  find ${kernel_source} \
 # known list of all Kconfig* files.  Again, must filter dups.
 rm -f ${LOGDIR}/all.cfg
 for i in `cat ${LOGDIR}/all.kcf` ; do
-    cat ${kernel_source}/$i | grep '^[ 	]*\(menu\)*config ' | \
+    cat ${kernel_source}/$i | grep '^[ 	]*\(menu\)*config\s' | \
 	awk '{print "CONFIG_"$2}' >> ${LOGDIR}/all.cfg
 done
 mv -f ${LOGDIR}/all.cfg ${LOGDIR}/all.cfg~

Comments

Bruce Ashfield Dec. 12, 2018, 6:45 p.m.
On 12/11/18 5:12 AM, Hongzhi.Song wrote:
> The cmd line, <grep '^[  ]*\(menu\)*config '>, can't
> match all expect config options.
> 
> This is because that it is not always space after 'config'

This should say "not always one space". There really should
always just be a single space, but typos do sneak in. I'll
queue the patch shortly.

Bruce

> in kernel-source/*/.../Kconfig.
> e.g. "config  IP_VS_IPV6" in net/netfilter/ipvs/Kconfig
> 
> So we should change the cmd to grep '^[  ]*\(menu\)*config\s'.
> 
> Signed-off-by: Hongzhi.Song <hongzhi.song@windriver.com>
> ---
>   tools/kconf_check | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/kconf_check b/tools/kconf_check
> index aa86180..20b49cd 100755
> --- a/tools/kconf_check
> +++ b/tools/kconf_check
> @@ -241,7 +241,7 @@ find ${kernel_source} \
>   # known list of all Kconfig* files.  Again, must filter dups.
>   rm -f ${LOGDIR}/all.cfg
>   for i in `cat ${LOGDIR}/all.kcf` ; do
> -    cat ${kernel_source}/$i | grep '^[ 	]*\(menu\)*config ' | \
> +    cat ${kernel_source}/$i | grep '^[ 	]*\(menu\)*config\s' | \
>   	awk '{print "CONFIG_"$2}' >> ${LOGDIR}/all.cfg
>   done
>   mv -f ${LOGDIR}/all.cfg ${LOGDIR}/all.cfg~
>
Hongzhi.Song Dec. 13, 2018, 1:36 a.m.
Thanks.

So would you help to remedy the commit log while merging the patch?


--Hongzhi


On 12/13/2018 02:45 AM, Bruce Ashfield wrote:
> On 12/11/18 5:12 AM, Hongzhi.Song wrote:
>> The cmd line, <grep '^[ ]*\(menu\)*config '>, can't
>> match all expect config options.
>>
>> This is because that it is not always space after 'config'
>
> This should say "not always one space". There really should
> always just be a single space, but typos do sneak in. I'll
> queue the patch shortly.
>
> Bruce
>
>> in kernel-source/*/.../Kconfig.
>> e.g. "config  IP_VS_IPV6" in net/netfilter/ipvs/Kconfig
>>
>> So we should change the cmd to grep '^[  ]*\(menu\)*config\s'.
>>
>> Signed-off-by: Hongzhi.Song <hongzhi.song@windriver.com>
>> ---
>>   tools/kconf_check | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/tools/kconf_check b/tools/kconf_check
>> index aa86180..20b49cd 100755
>> --- a/tools/kconf_check
>> +++ b/tools/kconf_check
>> @@ -241,7 +241,7 @@ find ${kernel_source} \
>>   # known list of all Kconfig* files.  Again, must filter dups.
>>   rm -f ${LOGDIR}/all.cfg
>>   for i in `cat ${LOGDIR}/all.kcf` ; do
>> -    cat ${kernel_source}/$i | grep '^[     ]*\(menu\)*config ' | \
>> +    cat ${kernel_source}/$i | grep '^[     ]*\(menu\)*config\s' | \
>>       awk '{print "CONFIG_"$2}' >> ${LOGDIR}/all.cfg
>>   done
>>   mv -f ${LOGDIR}/all.cfg ${LOGDIR}/all.cfg~
>>
>
>
Bruce Ashfield Dec. 17, 2018, 3:11 a.m.
On 2018-12-12 8:36 p.m., Hongzhi, Song wrote:
> Thanks.
> 
> So would you help to remedy the commit log while merging the patch?

I've tweaked the message and added this to my queue. It will
come out early this week.

Bruce

> 
> 
> --Hongzhi
> 
> 
> On 12/13/2018 02:45 AM, Bruce Ashfield wrote:
>> On 12/11/18 5:12 AM, Hongzhi.Song wrote:
>>> The cmd line, <grep '^[ ]*\(menu\)*config '>, can't
>>> match all expect config options.
>>>
>>> This is because that it is not always space after 'config'
>>
>> This should say "not always one space". There really should
>> always just be a single space, but typos do sneak in. I'll
>> queue the patch shortly.
>>
>> Bruce
>>
>>> in kernel-source/*/.../Kconfig.
>>> e.g. "config  IP_VS_IPV6" in net/netfilter/ipvs/Kconfig
>>>
>>> So we should change the cmd to grep '^[  ]*\(menu\)*config\s'.
>>>
>>> Signed-off-by: Hongzhi.Song <hongzhi.song@windriver.com>
>>> ---
>>>   tools/kconf_check | 2 +-
>>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/tools/kconf_check b/tools/kconf_check
>>> index aa86180..20b49cd 100755
>>> --- a/tools/kconf_check
>>> +++ b/tools/kconf_check
>>> @@ -241,7 +241,7 @@ find ${kernel_source} \
>>>   # known list of all Kconfig* files.  Again, must filter dups.
>>>   rm -f ${LOGDIR}/all.cfg
>>>   for i in `cat ${LOGDIR}/all.kcf` ; do
>>> -    cat ${kernel_source}/$i | grep '^[     ]*\(menu\)*config ' | \
>>> +    cat ${kernel_source}/$i | grep '^[     ]*\(menu\)*config\s' | \
>>>       awk '{print "CONFIG_"$2}' >> ${LOGDIR}/all.cfg
>>>   done
>>>   mv -f ${LOGDIR}/all.cfg ${LOGDIR}/all.cfg~
>>>
>>
>>
>