Commit 4f249a8b authored by Christophe Vu-Brugier's avatar Christophe Vu-Brugier Committed by Peter Korsgaard
Browse files

package/mdadm: update to v3.2.6

parent c64cfee0
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
config BR2_PACKAGE_MDADM
	bool "mdadm"
	help
	  Utility for managing RAID hardware.
	  Utility for managing Linux Software RAID arrays.

	  http://cgi.cse.unsw.edu.au/~neilb/mdadm
	  http://neil.brown.name/blog/mdadm
+32 −0
Original line number Diff line number Diff line
From a1a9243671b1e23123f57e879890325154b8e00d Mon Sep 17 00:00:00 2001
From: Christophe Vu-Brugier <cvubrugier@lacie.com>
Date: Wed, 6 Mar 2013 16:03:14 +0100
Subject: [PATCH] Add install targets for mdadm and mdmon


Signed-off-by: Christophe Vu-Brugier <cvubrugier@lacie.com>
---
 Makefile |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 315455b..27d8eeb 100644
--- a/Makefile
+++ b/Makefile
@@ -231,8 +231,12 @@ $(MON_OBJS) : $(INCL) mdmon.h
 sha1.o : sha1.c sha1.h md5.h
 	$(CC) $(CFLAGS) -DHAVE_STDINT_H -o sha1.o -c sha1.c
 
-install : mdadm mdmon install-man install-udev
+install : install-mdadm install-mdmon install-man install-udev
+
+install-mdadm :
 	$(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm
+
+install-mdmon :
 	$(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon
 
 install-static : mdadm.static install-man
-- 
1.7.10.4
+4 −4
Original line number Diff line number Diff line
@@ -9,11 +9,11 @@ Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
 mdadm.h |    4 ++++
 1 file changed, 4 insertions(+)

Index: mdadm-2.6.7.1/mdadm.h
Index: mdadm-3.2.6/mdadm.h
===================================================================
--- mdadm-2.6.7.1.orig/mdadm.h
+++ mdadm-2.6.7.1/mdadm.h
@@ -28,7 +28,11 @@
--- mdadm-3.2.6.orig/mdadm.h
+++ mdadm-3.2.6/mdadm.h
@@ -23,7 +23,11 @@
  */
 
 #define	_GNU_SOURCE
+27 −0
Original line number Diff line number Diff line
From 9c63360a2db71882cc548305774ce87af5f52b6e Mon Sep 17 00:00:00 2001
From: Christophe Vu-Brugier <cvubrugier@lacie.com>
Date: Thu, 7 Mar 2013 10:37:09 +0100
Subject: [PATCH] uClibc: redefine off64_t as off_t if largefile support is
 disabled


Signed-off-by: Christophe Vu-Brugier <cvubrugier@lacie.com>
---
 mdadm.h |    1 +
 1 file changed, 1 insertion(+)

diff --git a/mdadm.h b/mdadm.h
index 216c31d..1c72cc4 100644
--- a/mdadm.h
+++ b/mdadm.h
@@ -1008,6 +1008,7 @@ struct stat64;
 # include <features.h>
 # ifndef __UCLIBC_HAS_LFS__
 #  define lseek64 lseek
+#  define off64_t off_t
 # endif
 # ifndef  __UCLIBC_HAS_FTW__
 #  undef HAVE_FTW
-- 
1.7.10.4
+0 −15
Original line number Diff line number Diff line
diff -Naur mdadm-2.6.9/Makefile mdadm-2.6.9-patched/Makefile
--- mdadm-2.6.9/Makefile	2009-03-10 07:01:17.000000000 +0100
+++ mdadm-2.6.9-patched/Makefile	2009-10-10 15:53:13.329068128 +0200
@@ -161,7 +161,9 @@
 sha1.o : sha1.c sha1.h md5.h
 	$(CC) $(CFLAGS) -DHAVE_STDINT_H -o sha1.o -c sha1.c
 
-install : mdadm install-man
+install : install-mdadm install-man
+
+install-mdadm : mdadm
 	$(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm
 
 install-static : mdadm.static install-man
Loading