commit:     738dff0588df57b906832024a9ee5839bb708110
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 21 22:29:57 2019 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 22:29:57 2019 +0000
URL:        https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=738dff05

Bump mdadm to v4.1

Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>

 patches/mdadm/3.1.4/mdadm-3.1.4-z-now.patch | 26 ------------------------
 patches/mdadm/4.1/mdadm-3.4-sysmacros.patch | 31 +++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/patches/mdadm/3.1.4/mdadm-3.1.4-z-now.patch 
b/patches/mdadm/3.1.4/mdadm-3.1.4-z-now.patch
deleted file mode 100644
index 82b0b3e..0000000
--- a/patches/mdadm/3.1.4/mdadm-3.1.4-z-now.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 5296bc73a66e9eee31ba79d26aa02543205a7a26 Mon Sep 17 00:00:00 2001
-From: Sebastian Pipping <[email protected]>
-Date: Tue, 30 Aug 2011 14:38:14 +0200
-Subject: [PATCH] Replace "-z now" by "-Wl,-z,now" to fix compilation with GCC
- 4.4.5 on Alpha (bug #331653)
-
----
- Makefile |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index e2c65a5..0cc9a87 100644
---- a/Makefile
-+++ b/Makefile
-@@ -167,7 +167,7 @@ mdmon.O2 : $(MON_SRCS) mdadm.h mdmon.h
- 
- # use '-z now' to guarantee no dynamic linker interactions with the monitor 
thread
- mdmon : $(MON_OBJS)
--      $(CC) $(LDFLAGS) $(MON_LDFLAGS) -z now -o mdmon $(MON_OBJS) $(LDLIBS)
-+      $(CC) $(LDFLAGS) $(MON_LDFLAGS) -Wl,-z,now -o mdmon $(MON_OBJS) 
$(LDLIBS)
- msg.o: msg.c msg.h
- 
- test_stripe : restripe.c mdadm.h
--- 
-1.7.6.1
-

diff --git a/patches/mdadm/4.1/mdadm-3.4-sysmacros.patch 
b/patches/mdadm/4.1/mdadm-3.4-sysmacros.patch
new file mode 100644
index 0000000..22a3934
--- /dev/null
+++ b/patches/mdadm/4.1/mdadm-3.4-sysmacros.patch
@@ -0,0 +1,31 @@
+https://bugs.gentoo.org/580188
+
+From 5c97e465b33bf8fefb17da7f553a1c3812e508d5 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <[email protected]>
+Date: Tue, 19 Apr 2016 18:10:54 -0400
+Subject: [PATCH] include sys/sysmacros.h for major/minor/makedev prototypes
+
+These funcs are defined in sys/sysmacros.h, so include it for them.
+It works today due to an implicit include by sys/types.h, but the
+various Linux C libraries are moving away from that.
+
+Signed-off-by: Mike Frysinger <[email protected]>
+---
+ mdadm.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/mdadm.h b/mdadm.h
+index d209488..b8767a7 100755
+--- a/mdadm.h
++++ b/mdadm.h
+@@ -33,6 +33,7 @@ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, 
int __whence));
+ # endif
+ #endif
+ 
++#include      <sys/sysmacros.h>
+ #include      <sys/types.h>
+ #include      <sys/stat.h>
+ #include      <stdint.h>
+-- 
+2.7.4
+

Reply via email to