problem with enabling config options

problem with enabling config options

[Stefan Assmann]

I'm looking into enabling more wired network drivers and ran into the
issue that I could not enable CONFIG_E1000 for example. The problem
seems to be that because CONFIG_E100 is disabled you cannot enable
anything CONFIG_E100*. It looks like a bug in gentree.py, but my python
foo didn't suffice to get it sorted out. Problem should be located
somewhere around line 1060 where the CONFIG variable regex stuff
happens.

Luis, could you have a look?
Thanks!

  Stefan

Re: problem with enabling config options

[Johannes Berg]

On Thu, 2015-05-07 at 13:15 +0200, Stefan Assmann wrote:
> I'm looking into enabling more wired network drivers and ran into the
> issue that I could not enable CONFIG_E1000 for example. The problem
> seems to be that because CONFIG_E100 is disabled you cannot enable
> anything CONFIG_E100*. It looks like a bug in gentree.py, but my python
> foo didn't suffice to get it sorted out. Problem should be located
> somewhere around line 1060 where the CONFIG variable regex stuff
> happens.

I think you can try to add \W to the very end of the regex there.

johannes

Re: problem with enabling config options

[Stefan Assmann]

On 07.05.2015 13:48, Johannes Berg wrote:
> On Thu, 2015-05-07 at 13:15 +0200, Stefan Assmann wrote:
>> I'm looking into enabling more wired network drivers and ran into the
>> issue that I could not enable CONFIG_E1000 for example. The problem
>> seems to be that because CONFIG_E100 is disabled you cannot enable
>> anything CONFIG_E100*. It looks like a bug in gentree.py, but my python
>> foo didn't suffice to get it sorted out. Problem should be located
>> somewhere around line 1060 where the CONFIG variable regex stuff
>> happens.
> 
> I think you can try to add \W to the very end of the regex there.
> 
> johannes
> 

Thanks Johannes, that worked. Proposing patch and Cc Hauke.

  Stefan

>From da662be25373468dac47234f2f164fcc8503ebb4 Mon Sep 17 00:00:00 2001
From: Stefan Assmann <sassmann@kpanic.de>
Date: Thu, 7 May 2015 14:08:56 +0200
Subject: [PATCH] backports: fix incorrect disabling of CONFIG options

gentree.py incorrectly disabled CONFIG options that share part of the
name with another already disabled CONFIG option.
For example if CONFIG_E100 was disabled you no longer could enable
CONFIG_E1000 or CONFIG_E1000E.

Signed-off-by: Stefan Assmann <sassmann@kpanic.de>
---
 gentree.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gentree.py b/gentree.py
index edff138..636ea60 100755
--- a/gentree.py
+++ b/gentree.py
@@ -1057,7 +1057,7 @@ def process(kerneldir, copy_list_file, git_revision=None,
     # groups -- 50 seemed safer and is still fast)
     regexes = []
     for some_symbols in [disable_makefile[i:i + 50] for i in range(0, len(disable_makefile), 50)]:
-        r = '^([^#].*((' + bpid.full_prefix_resafe + '|CONFIG_)(' + '|'.join([s for s in some_symbols]) + ')))'
+        r = '^([^#].*((' + bpid.full_prefix_resafe + '|CONFIG_)(' + '|'.join([s for s in some_symbols]) + ')))\W'
         regexes.append(re.compile(r, re.MULTILINE))
     for f in maketree.get_makefiles():
         data = open(f, 'r').read()
-- 
2.1.0

Re: problem with enabling config options

[Hauke Mehrtens]

On 05/07/2015 02:19 PM, Stefan Assmann wrote:
> On 07.05.2015 13:48, Johannes Berg wrote:
>> On Thu, 2015-05-07 at 13:15 +0200, Stefan Assmann wrote:
>>> I'm looking into enabling more wired network drivers and ran into the
>>> issue that I could not enable CONFIG_E1000 for example. The problem
>>> seems to be that because CONFIG_E100 is disabled you cannot enable
>>> anything CONFIG_E100*. It looks like a bug in gentree.py, but my python
>>> foo didn't suffice to get it sorted out. Problem should be located
>>> somewhere around line 1060 where the CONFIG variable regex stuff
>>> happens.
>>
>> I think you can try to add \W to the very end of the regex there.
>>
>> johannes
>>
> 
> Thanks Johannes, that worked. Proposing patch and Cc Hauke.
> 
>   Stefan
> 
> From da662be25373468dac47234f2f164fcc8503ebb4 Mon Sep 17 00:00:00 2001
> From: Stefan Assmann <sassmann@kpanic.de>
> Date: Thu, 7 May 2015 14:08:56 +0200
> Subject: [PATCH] backports: fix incorrect disabling of CONFIG options
> 
> gentree.py incorrectly disabled CONFIG options that share part of the
> name with another already disabled CONFIG option.
> For example if CONFIG_E100 was disabled you no longer could enable
> CONFIG_E1000 or CONFIG_E1000E.
> 
> Signed-off-by: Stefan Assmann <sassmann@kpanic.de>
> ---
>  gentree.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
Thank you for the patch, it was applied and pushed out.

Hauke