Re: [PATCH] Makefile: add LABEL support
From: Jes Sorensen <hidden>
Date: 2020-05-14 14:24:05
On 5/13/20 7:00 AM, Tkaczyk Mariusz wrote:
Add optional LABEL parameter to Makefile and allow to mark version by user friendly label. It might be useful when creating custom spins of mdadm, or labeling some instance in between major releases. Signed-off-by: Tkaczyk Mariusz <redacted> --- Makefile | 3 ++- ReadMe.c | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-)
I am not against this, but could we name it EXTRAVERSION to match what the kernel does? Cheers, Jes
quoted hunk ↗ jump to hunk
diff --git a/Makefile b/Makefile index a33319a8..9c129c54 100644 --- a/Makefile +++ b/Makefile@@ -105,7 +105,8 @@ VERSION = $(shell [ -d .git ] && git describe HEAD | sed 's/mdadm-//') VERS_DATE = $(shell [ -d .git ] && date --iso-8601 --date="`git log -n1 --format=format:%cd --date=iso --date=short`") DVERS = $(if $(VERSION),-DVERSION=\"$(VERSION)\",) DDATE = $(if $(VERS_DATE),-DVERS_DATE="\"$(VERS_DATE)\"",) -CFLAGS += $(DVERS) $(DDATE) +DLABEL = $(if $(LABEL),-DLABEL="\" - $(LABEL)\"",) +CFLAGS += $(DVERS) $(DDATE) $(DLABEL) # The glibc TLS ABI requires applications that call clone(2) to set up # TLS data structures, use pthreads until mdmon implements this supportdiff --git a/ReadMe.c b/ReadMe.c index eaf10423..883136df 100644 --- a/ReadMe.c +++ b/ReadMe.c@@ -33,7 +33,10 @@ #ifndef VERS_DATE #define VERS_DATE "2018-10-01" #endif -char Version[] = "mdadm - v" VERSION " - " VERS_DATE "\n"; +#ifndef LABEL +#define LABEL "" +#endif +char Version[] = "mdadm - v" VERSION " - " VERS_DATE LABEL "\n"; /* * File: ReadMe.c