505f19f50d
- Update to latest mdadm which is requested by jsc#SLE-13700 from partners. Mostly the purpose is for latest Intel IMSM raid support, while some other fixes are important too. - imsm: Correct minimal device size (jsc#SLE-13700) 0073-imsm-Correct-minimal-device-size.patch - Detail: show correct bitmap info for cluster raid device (jsc#SLE-13700) 0074-Detail-show-correct-bitmap-info-for-cluster-raid-dev.patch - imsm: support the Array Creation Time field in metadata (jsc#SLE-13700) 0075-imsm-support-the-Array-Creation-Time-field-in-metada.patch - imsm: show Subarray and Volume ID in --examine output (jsc#SLE-13700) 0076-imsm-show-Subarray-and-Volume-ID-in-examine-output.patch - udev: Ignore change event for imsm (jsc#SLE-13700) 0077-udev-Ignore-change-event-for-imsm.patch - Manage, imsm: Write metadata before add (jsc#SLE-13700) 0078-Manage-imsm-Write-metadata-before-add.patch - Assemble: print error message if mdadm fails assembling with --uuid option (jsc#SLE-13700) 0079-Assemble-print-error-message-if-mdadm-fails-assembli.patch - clean up meaning of small typo (jsc#SLE-13700) 0080-clean-up-meaning-of-small-typo.patch - Assemble.c: respect force flag (jsc#SLE-13700) 0081-Assemble.c-respect-force-flag.patch - mdcheck: Log when done (jsc#SLE-13700) 0082-mdcheck-Log-when-done.patch - Makefile: add EXTRAVERSION support (jsc#SLE-13700) 0083-Makefile-add-EXTRAVERSION-support.patch - uuid.c: split uuid stuffs from util.c (jsc#SLE-13700) OBS-URL: https://build.opensuse.org/request/show/841255 OBS-URL: https://build.opensuse.org/package/show/Base:System/mdadm?expand=0&rev=189
54 lines
1.8 KiB
Diff
54 lines
1.8 KiB
Diff
From 03ab9763f51ddf2030f60f83e76cf9c1b50b726c Mon Sep 17 00:00:00 2001
|
|
From: Tkaczyk Mariusz <mariusz.tkaczyk@intel.com>
|
|
Date: Fri, 15 May 2020 11:23:14 +0200
|
|
Subject: [PATCH 78/89] Makefile: add EXTRAVERSION support
|
|
Git-commit: 03ab9763f51ddf2030f60f83e76cf9c1b50b726c
|
|
Patch-mainline: mdadm-4.1+
|
|
References: jsc#SLE-13700
|
|
|
|
Add optional EXTRAVERSION 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 <mariusz.tkaczyk@intel.com>
|
|
Signed-off-by: Jes Sorensen <jsorensen@fb.com>
|
|
Signed-off-by: Coly Li <colyli@suse.de>
|
|
---
|
|
Makefile | 3 ++-
|
|
ReadMe.c | 5 ++++-
|
|
2 files changed, 6 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index a33319a..0a20b75 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)
|
|
+DEXTRAVERSION = $(if $(EXTRAVERSION),-DEXTRAVERSION="\" - $(EXTRAVERSION)\"",)
|
|
+CFLAGS += $(DVERS) $(DDATE) $(DEXTRAVERSION)
|
|
|
|
# The glibc TLS ABI requires applications that call clone(2) to set up
|
|
# TLS data structures, use pthreads until mdmon implements this support
|
|
diff --git a/ReadMe.c b/ReadMe.c
|
|
index eaf1042..06b8f7e 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 EXTRAVERSION
|
|
+#define EXTRAVERSION ""
|
|
+#endif
|
|
+char Version[] = "mdadm - v" VERSION " - " VERS_DATE EXTRAVERSION "\n";
|
|
|
|
/*
|
|
* File: ReadMe.c
|
|
--
|
|
2.26.2
|
|
|