From ca43834d66f08ed7244c26ef8edbe1a9ee2b8e8c Mon Sep 17 00:00:00 2001 From: Chris Packham Date: Tue, 2 May 2017 21:30:47 +1200 Subject: [PATCH] tools: moveconfig: cleanup whitelist entries After moving to KConfig and removing from all headers options should be removed from config_whitelist.txt so the build starts complaining if someone adds them back. Acked-by: Masahiro Yamada Signed-off-by: Chris Packham Reviewed-by: Simon Glass --- tools/moveconfig.py | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tools/moveconfig.py b/tools/moveconfig.py index f8d485703f..2361a430dc 100755 --- a/tools/moveconfig.py +++ b/tools/moveconfig.py @@ -600,6 +600,25 @@ def cleanup_extra_options(configs, options): cleanup_one_extra_option(os.path.join('configs', defconfig), configs, options) +def cleanup_whitelist(configs, options): + """Delete config whitelist entries + + Arguments: + configs: A list of CONFIGs to remove. + options: option flags. + """ + if not confirm(options, 'Clean up whitelist entries?'): + return + + with open(os.path.join('scripts', 'config_whitelist.txt')) as f: + lines = f.readlines() + + lines = [x for x in lines if x.strip() not in configs] + + with open(os.path.join('scripts', 'config_whitelist.txt'), 'w') as f: + f.write(''.join(lines)) + + ### classes ### class Progress: @@ -1296,6 +1315,7 @@ def main(): if configs: cleanup_headers(configs, options) cleanup_extra_options(configs, options) + cleanup_whitelist(configs, options) if options.commit: subprocess.call(['git', 'add', '-u']) -- 2.25.1