projects / buildroot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c64cfee)
package/mdadm: update to v3.2.6
authorChristophe Vu-Brugier <cvubrugier@lacie.com>
Thu, 7 Mar 2013 00:21:05 +0000 (00:21 +0000)
committerPeter Korsgaard <jacmet@sunsite.dk>
Sun, 10 Mar 2013 22:02:32 +0000 (23:02 +0100)
Signed-off-by: Christophe Vu-Brugier <cvubrugier@lacie.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
package/mdadm/Config.in patch | blob | history
package/mdadm/mdadm-010-add-install-targets-for-mdadm-and-mdmon.patch [new file with mode: 0644] patch | blob
package/mdadm/mdadm-020-uclibc-dont-force-largefile.patch [new file with mode: 0644] patch | blob
package/mdadm/mdadm-030-uclibc-redefine-off64_t-as-off_t-if-no-largefile.patch [new file with mode: 0644] patch | blob
package/mdadm/mdadm-2.6.9-001.uclibc-dont-force-largefile.patch [deleted file] patch | blob | history
package/mdadm/mdadm-2.6.9-002.install-without-manpages.patch [deleted file] patch | blob | history
package/mdadm/mdadm.mk patch | blob | history

diff --git a/package/mdadm/Config.in b/package/mdadm/Config.in
index 64264531de76826d76347ce3195f08e40bcd875e..c5133488f59cf758bb5d23ed69e538bc3e495058 100644 (file)
--- a/package/mdadm/Config.in
+++ b/package/mdadm/Config.in
@@ -1,6 +1,6 @@
 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
diff --git a/package/mdadm/mdadm-010-add-install-targets-for-mdadm-and-mdmon.patch b/package/mdadm/mdadm-010-add-install-targets-for-mdadm-and-mdmon.patch
new file mode 100644 (file)
index 0000000..15df755
--- /dev/null
+++ b/package/mdadm/mdadm-010-add-install-targets-for-mdadm-and-mdmon.patch
@@ -0,0 +1,32 @@
+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
+
diff --git a/package/mdadm/mdadm-020-uclibc-dont-force-largefile.patch b/package/mdadm/mdadm-020-uclibc-dont-force-largefile.patch
new file mode 100644 (file)
index 0000000..fe3ab47
--- /dev/null
+++ b/package/mdadm/mdadm-020-uclibc-dont-force-largefile.patch
@@ -0,0 +1,27 @@
+[PATCH] mdadm: don't enable largefile support unconditionally on uClibc
+
+uClibc can be compiled without largefile support (and errors out if
+_FILE_OFFSET_BITS is set to 64), so don't define it if that combination
+is detected.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ mdadm.h |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+Index: mdadm-3.2.6/mdadm.h
+===================================================================
+--- mdadm-3.2.6.orig/mdadm.h
++++ mdadm-3.2.6/mdadm.h
+@@ -23,7 +23,11 @@
+  */
+ 
+ #define       _GNU_SOURCE
++#include <features.h>
++/* uclibc without largefile support #errors on _FILE_OFFSET_BITS=64 */
++#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_LFS__))
+ #define _FILE_OFFSET_BITS 64
++#endif
+ #include      <unistd.h>
+ #if !defined(__dietlibc__) && !defined(__KLIBC__)
+ extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence));
diff --git a/package/mdadm/mdadm-030-uclibc-redefine-off64_t-as-off_t-if-no-largefile.patch b/package/mdadm/mdadm-030-uclibc-redefine-off64_t-as-off_t-if-no-largefile.patch
new file mode 100644 (file)
index 0000000..d958ab8
--- /dev/null
+++ b/package/mdadm/mdadm-030-uclibc-redefine-off64_t-as-off_t-if-no-largefile.patch
@@ -0,0 +1,27 @@
+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
+
diff --git a/package/mdadm/mdadm-2.6.9-001.uclibc-dont-force-largefile.patch b/package/mdadm/mdadm-2.6.9-001.uclibc-dont-force-largefile.patch
deleted file mode 100644 (file)
index c671437..0000000
--- a/package/mdadm/mdadm-2.6.9-001.uclibc-dont-force-largefile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-[PATCH] mdadm: don't enable largefile support unconditionally on uClibc
-
-uClibc can be compiled without largefile support (and errors out if
-_FILE_OFFSET_BITS is set to 64), so don't define it if that combination
-is detected.
-
-Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
----
- mdadm.h |    4 ++++
- 1 file changed, 4 insertions(+)
-
-Index: mdadm-2.6.7.1/mdadm.h
-===================================================================
---- mdadm-2.6.7.1.orig/mdadm.h
-+++ mdadm-2.6.7.1/mdadm.h
-@@ -28,7 +28,11 @@
-  */
- 
- #define       _GNU_SOURCE
-+#include <features.h>
-+/* uclibc without largefile support #errors on _FILE_OFFSET_BITS=64 */
-+#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_LFS__))
- #define _FILE_OFFSET_BITS 64
-+#endif
- #include      <unistd.h>
- #if !defined(__dietlibc__) && !defined(__KLIBC__)
- extern __off64_t lseek64 __P ((int __fd, __off64_t __offset, int __whence));
diff --git a/package/mdadm/mdadm-2.6.9-002.install-without-manpages.patch b/package/mdadm/mdadm-2.6.9-002.install-without-manpages.patch
deleted file mode 100644 (file)
index 7ab1a7b..0000000
--- a/package/mdadm/mdadm-2.6.9-002.install-without-manpages.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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
-
diff --git a/package/mdadm/mdadm.mk b/package/mdadm/mdadm.mk
index dd2b49fe60da3f4917c17b1a8f246555109957e8..d5d1766c181871698b1c3a0a2d12f0ed254eae05 100644 (file)
--- a/package/mdadm/mdadm.mk
+++ b/package/mdadm/mdadm.mk
@@ -4,7 +4,7 @@
 #
 #############################################################
 
-MDADM_VERSION = 2.6.9
+MDADM_VERSION = 3.2.6
 MDADM_SOURCE = mdadm-$(MDADM_VERSION).tar.bz2
 MDADM_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/raid/mdadm