From c8d08ca31313d9ef5f85d0614f00eb3e4494aa71 Mon Sep 17 00:00:00 2001 From: Hung-Te Lin Date: Sat, 17 Jun 2017 03:07:58 +0800 Subject: [PATCH] futility: Change 'gbb_utility' to sub command 'gbb'. 'gbb_utility' is the command name before it has been merged to futility. However, it's pretty long and redundant today if we have to type 'futility gbb_utility ...'. New features of futility are now implemented as sub-commands (futility cmd) instead of symlinks (for example, 'create', 'show', 'sign', 'verify') so it seems reasonable to just change gbb_utility to a sub-command style name 'gbb'. Meanwhile, for backward compatibility, the 'gbb_utility' name is still supported so symlinks will still work. BRANCH=none BUG=None TEST=emerge vboot_reference; futility gbb Change-Id: I4de59bcc564576420ab71157cb166fc8a42e85ad Signed-off-by: Hung-Te Lin Reviewed-on: https://chromium-review.googlesource.com/538398 Reviewed-by: Randall Spangler --- futility/cmd_gbb_utility.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/futility/cmd_gbb_utility.c b/futility/cmd_gbb_utility.c index f75cceb02c..796eca7a71 100644 --- a/futility/cmd_gbb_utility.c +++ b/futility/cmd_gbb_utility.c @@ -353,7 +353,7 @@ done_close: return r; } -static int do_gbb_utility(int argc, char *argv[]) +static int do_gbb(int argc, char *argv[]) { enum do_what_now { DO_GET, DO_SET, DO_CREATE } mode = DO_GET; char *infile = NULL; @@ -658,5 +658,7 @@ static int do_gbb_utility(int argc, char *argv[]) return !!errorcnt; } -DECLARE_FUTIL_COMMAND(gbb_utility, do_gbb_utility, VBOOT_VERSION_ALL, +DECLARE_FUTIL_COMMAND(gbb, do_gbb, VBOOT_VERSION_ALL, "Manipulate the Google Binary Block (GBB)"); +DECLARE_FUTIL_COMMAND(gbb_utility, do_gbb, VBOOT_VERSION_ALL, + "Legacy name for `gbb` command");