On Fri, 21 Jun 2024 at 02:06, Simon Glass <s...@chromium.org> wrote:
>
> Tools should have an option to obtain the version, so add this to the
> mkeficapsule tool.
>
> Signed-off-by: Simon Glass <s...@chromium.org>
> ---
>
> (no changes since v1)
>
> doc/mkeficapsule.1 | 4 ++++
> tools/mkeficapsule.c | 8 +++++++-
> 2 files changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/doc/mkeficapsule.1 b/doc/mkeficapsule.1
> index c4c2057d5c7..c3d0f21488a 100644
> --- a/doc/mkeficapsule.1
> +++ b/doc/mkeficapsule.1
> @@ -87,6 +87,10 @@ Generate a firmware revert empty capsule
> .BI "-o\fR,\fB --capoemflag "
> Capsule OEM flag, value between 0x0000 to 0xffff
>
> +.TP
> +.BR -V ", " --version
> +Print version information and exit.
> +
> .TP
> .BR -h ", " --help
> Print a help message
> diff --git a/tools/mkeficapsule.c b/tools/mkeficapsule.c
> index 6a261ff549d..c112ae2de8d 100644
> --- a/tools/mkeficapsule.c
> +++ b/tools/mkeficapsule.c
> @@ -21,6 +21,8 @@
> #include <gnutls/pkcs7.h>
> #include <gnutls/abstract.h>
>
> +#include <version.h>
> +
> #include "eficapsule.h"
>
> static const char *tool_name = "mkeficapsule";
> @@ -28,7 +30,7 @@ static const char *tool_name = "mkeficapsule";
> efi_guid_t efi_guid_fm_capsule = EFI_FIRMWARE_MANAGEMENT_CAPSULE_ID_GUID;
> efi_guid_t efi_guid_cert_type_pkcs7 = EFI_CERT_TYPE_PKCS7_GUID;
>
> -static const char *opts_short = "g:i:I:v:p:c:m:o:dhARD";
> +static const char *opts_short = "g:i:I:v:p:c:m:o:dhARDV";
>
> enum {
> CAPSULE_NORMAL_BLOB = 0,
> @@ -70,6 +72,7 @@ static void print_usage(void)
> "\t-R, --fw-revert firmware revert capsule, takes no GUID,
> no image blob\n"
> "\t-o, --capoemflag Capsule OEM Flag, an integer between
> 0x0000 and 0xffff\n"
> "\t-D, --dump-capsule dump the contents of the
> capsule headers\n"
> + "\t-V, --version show version number\n"
> "\t-h, --help print a help message\n",
> tool_name);
> }
> @@ -969,6 +972,9 @@ int main(int argc, char **argv)
> case 'D':
> capsule_dump = true;
> break;
> + case 'V':
> + printf("mkeficapsule version %s\n", PLAIN_VERSION);
> + exit(EXIT_SUCCESS);
> default:
> print_usage();
> exit(EXIT_SUCCESS);
> --
> 2.34.1
>
Reviewed-by: Ilias Apalodimas <ilias.apalodi...@linaro.org>
