diff options
| author | Stefan Assmann <sassmann@kpanic.de> | 2015-05-07 14:19:57 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-06-30 23:05:01 +0200 |
| commit | 03765883431cd9378d80882c678f3922a1cfe16e (patch) | |
| tree | d0b36ae12f55d515420b8561a9cdb051d8320d68 | |
| parent | 369ad48d3c13a882b992f5e113122040f62f1f07 (diff) | |
backports: fix incorrect disabling of CONFIG options
Upstream commit: 3746c6d3c4386fc93647dd342675068063a39be9
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>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
| -rwxr-xr-x | gentree.py | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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() |