[PATCH] gentree: fix Makefile symbol disabling

[PATCH] gentree: fix Makefile symbol disabling

[Johannes Berg]

From: Johannes Berg <johannes.berg@intel.com>

Currently, a Makefile line like this:

    obj-$(CONFIG_IPW2100) += ipw2x00/

will get mangled into

    #obj-$(CONFIG_IPW2100+= ipw2x00/

when disabled by the gentree script. Fix the regular
expression to contain the entire match as the first
group, so it gets all preserved when replaced later
by "#\1" using expression.sub().

This then makes it come out as

    #obj-$(CONFIG_IPW2100) += ipw2x00/

Signed-off-by: Johannes Berg <johannes.berg@intel.com>
---
 gentree.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gentree.py b/gentree.py
index 636ea609ba57..772095fcf580 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]) + ')))\W'
+        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.6.2

--
To unsubscribe from this list: send the line "unsubscribe backports" in

Re: [PATCH] gentree: fix Makefile symbol disabling

[Hauke Mehrtens]

On 11/06/2015 09:16 AM, Johannes Berg wrote:
> From: Johannes Berg <johannes.berg@intel.com>
> 
> Currently, a Makefile line like this:
> 
>     obj-$(CONFIG_IPW2100) += ipw2x00/
> 
> will get mangled into
> 
>     #obj-$(CONFIG_IPW2100+= ipw2x00/
> 
> when disabled by the gentree script. Fix the regular
> expression to contain the entire match as the first
> group, so it gets all preserved when replaced later
> by "#\1" using expression.sub().
> 
> This then makes it come out as
> 
>     #obj-$(CONFIG_IPW2100) += ipw2x00/
> 
> Signed-off-by: Johannes Berg <johannes.berg@intel.com>
> ---
>  gentree.py | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
Thank you for the patch, it was applied.

Hauke

--
To unsubscribe from this list: send the line "unsubscribe backports" in