diff options
author | Luis R. Rodriguez <mcgrof@suse.com> | 2014-11-10 23:51:19 -0800 |
---|---|---|
committer | Luis R. Rodriguez <mcgrof@do-not-panic.com> | 2014-11-14 13:47:15 -0800 |
commit | f40d37099b9bf60b9e7214f28bd30007d2961d3d (patch) | |
tree | a7e1950b8ab2ae212fa687aef006c6372147f505 /gentree.py | |
parent | 6792a6d1ef5ea3dabf3ebf347a8db8b562b59f24 (diff) |
backports: keep track of original backported source symbols early on
We'll later want to do some modifications of symbols we backport
when integrating, but before we do any modification on kconfig
files we should keep track of the original source symbols.
This commit introduces no functional changes right now, it will
become more useful after we start adjusting kconfig entries
for integration.
Signed-off-by: Luis R. Rodriguez <mcgrof@suse.com>
Diffstat (limited to 'gentree.py')
-rwxr-xr-x | gentree.py | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -768,6 +768,7 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None, # some post-processing is required configtree = kconfig.ConfigTree(os.path.join(args.outdir, 'Kconfig')) + orig_symbols = configtree.symbols() logwrite('Modify Kconfig tree ...') configtree.prune_sources(ignore=['Kconfig.kernel', 'Kconfig.versions']) git_debug_snapshot(args, "prune Kconfig tree") @@ -829,7 +830,7 @@ def process(kerneldir, outdir, copy_list_file, git_revision=None, # rewrite Makefile and source symbols regexes = [] - for some_symbols in [symbols[i:i + 50] for i in range(0, len(symbols), 50)]: + for some_symbols in [orig_symbols[i:i + 50] for i in range(0, len(orig_symbols), 50)]: r = 'CONFIG_((' + '|'.join([s + '(_MODULE)?' for s in some_symbols]) + ')([^A-Za-z0-9_]|$))' regexes.append(re.compile(r, re.MULTILINE)) for root, dirs, files in os.walk(args.outdir): |