From 145c74ab6f2e13a9a8ccdbbf1758afedb8a3965c Mon Sep 17 00:00:00 2001 From: Christian Loehle Date: Wed, 12 Apr 2023 15:04:42 +0000 Subject: [PATCH] mmc-utils: Change version string to git hash Since mmc-utils versioning has always been 0.1 and changes are not made frequently and formal releases do not happen, packaged versions are just pulled from git anyway, using the git hash for version is probably the best idea for now. Signed-off-by: Christian Loehle Link: https://lore.kernel.org/r/28623fa7390242e9b003a44016c0235f@hyperstone.com Signed-off-by: Ulf Hansson --- Makefile | 3 ++- mmc.c | 6 ++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index aa27ff2..d8d59a4 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,7 @@ CC ?= gcc +GIT_VERSION := "$(shell git describe --abbrev=6 --always --tags)" AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2 -CFLAGS ?= -g -O2 +CFLAGS ?= -g -O2 -DVERSION=\"$(GIT_VERSION)\" objects = \ mmc.o \ mmc_cmds.o \ diff --git a/mmc.c b/mmc.c index b9aa478..795b4e3 100644 --- a/mmc.c +++ b/mmc.c @@ -26,8 +26,6 @@ #include "mmc_cmds.h" -#define MMC_VERSION "0.1" - #define BASIC_HELP 0 #define ADVANCED_HELP 1 @@ -319,7 +317,7 @@ static void help(char *np) printf("\n\t%s help|--help|-h\n\t\tShow the help.\n",np); printf("\n\t%s --help\n\t\tShow detailed help for a command or subset of commands.\n",np); - printf("\n%s\n", MMC_VERSION); + printf("\n%s\n", VERSION); } static int split_command(char *cmd, char ***commands) @@ -500,7 +498,7 @@ static int parse_args(int argc, char **argv, } if(helprequested){ - printf("\n%s\n", MMC_VERSION); + printf("\n%s\n", VERSION); return 0; }