Skip to contentSkip to conversation

problem with enabling config options

DISCUSSION Stefan Assmann 3 participants 4 messages May 7, 2015 – May 11, 2015

lore
Share & tools
lore
#0 lore raw

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

#1 lore raw
Quoted 7 lines · 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.

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

johannes

#2 lore raw
Quoted 9 lines · Johannes Berg
Quoted 7 lines · 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.

Quoted 4 lines

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

Quoted 1 line

From da662be25373468dac47234f2f164fcc8503ebb4 Mon Sep 17 00:00:00 2001

From: Stefan Assmann <[email protected]>
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.

---
 gentree.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
gentree.py +1 -1
index edff138..636ea60 100755
@@ -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()
Signature · 1 line
2.1.0
#3 lore raw
Quoted 29 lines · Stefan Assmann
Quoted 9 lines · Johannes Berg
Quoted 7 lines · 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.

Quoted 4 lines

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 <[email protected]>
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.

Quoted 5 lines
---
 gentree.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Thank you for the patch, it was applied and pushed out.

Hauke