path: root/tools
diff options
authorMasahiro Yamada <>2016-05-19 15:52:08 +0900
committerMasahiro Yamada <>2016-06-13 07:46:28 +0900
commit8513dc048598bba15f75ab3fbe257159cb27007a (patch)
treea3a7dfbf5a87da7638b52f65dd95fcf4db5c4ce6 /tools
parentc8e1b10d07b1dbbf3cbf882ac270476b964d05ff (diff)
tools: moveconfig: add --force-sync option
Now, this tools invokes "make savedefconfig" only when it needs to do so, but there might be cases where a user wants the tool to do savedefconfig forcibly, for example, some defconfigs were already out of sync and the user wants to fix it as well. Signed-off-by: Masahiro Yamada <> Reviewed-by: Joe Hershberger <>
Diffstat (limited to 'tools')
1 files changed, 14 insertions, 3 deletions
diff --git a/tools/ b/tools/
index a8531f1e51..95a73569a1 100755
--- a/tools/
+++ b/tools/
@@ -131,6 +131,11 @@ Available options
Exit immediately if Make exits with a non-zero status while processing
a defconfig file.
+ -s, --force-sync
+ Do "make savedefconfig" forcibly for all the defconfig files.
+ If not specified, "make savedefconfig" only occurs for cases
+ where at least one CONFIG was moved.
-H, --headers-only
Only cleanup the headers; skip the defconfig processing
@@ -672,11 +677,15 @@ class Slot:
(updated, log) = self.parser.update_dotconfig()
self.log += log
- if not updated:
+ if not self.options.force_sync and not updated:
return True
- self.log += color_text(self.options.color, COLOR_LIGHT_GREEN,
- "Syncing by savedefconfig...\n")
+ if updated:
+ self.log += color_text(self.options.color, COLOR_LIGHT_GREEN,
+ "Syncing by savedefconfig...\n")
+ else:
+ self.log += "Syncing by savedefconfig (forced by option)...\n"
cmd = list(self.make_cmd)
cmd.append('savedefconfig') = subprocess.Popen(cmd, stdout=self.devnull,
@@ -887,6 +896,8 @@ def main():
parser.add_option('-e', '--exit-on-error', action='store_true',
help='exit immediately on any error')
+ parser.add_option('-s', '--force-sync', action='store_true', default=False,
+ help='force sync by savedefconfig')
parser.add_option('-H', '--headers-only', dest='cleanup_headers_only',
action='store_true', default=False,
help='only cleanup the headers')
OpenPOWER on IntegriCloud