summaryrefslogtreecommitdiff
path: root/package/mdadm
diff options
context:
space:
mode:
Diffstat (limited to 'package/mdadm')
-rw-r--r--package/mdadm/Makefile10
-rw-r--r--package/mdadm/patches/patch-Makefile17
-rw-r--r--package/mdadm/patches/patch-platform-intel_c8
3 files changed, 22 insertions, 13 deletions
diff --git a/package/mdadm/Makefile b/package/mdadm/Makefile
index 28f61ee6d..217279c9a 100644
--- a/package/mdadm/Makefile
+++ b/package/mdadm/Makefile
@@ -4,9 +4,9 @@
include ${TOPDIR}/rules.mk
PKG_NAME:= mdadm
-PKG_VERSION:= 3.0
-PKG_RELEASE:= 2
-PKG_MD5SUM:= 1eb89885b2b881562fc79ed2f5e1a056
+PKG_VERSION:= 3.1.1
+PKG_RELEASE:= 1
+PKG_MD5SUM:= 8bfeea282d21b5ef8e825122fb359457
PKG_DESCR:= tool for managing Linux Software RAID arrays
PKG_SECTION:= utils
PKG_URL:= http://neil.brown.name/blog/mdadm
@@ -16,9 +16,9 @@ include ${TOPDIR}/mk/package.mk
$(eval $(call PKG_template,MDADM,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+CONFIG_STYLE:= manual
+
XAKE_FLAGS+= CROSS_COMPILE="${TARGET_CROSS}"
-BUILD_STYLE:= auto
-INSTALL_STYLE:= auto
post-install:
${INSTALL_DIR} ${IDIR_MDADM}/usr/sbin
diff --git a/package/mdadm/patches/patch-Makefile b/package/mdadm/patches/patch-Makefile
index 79b801c74..cbe429082 100644
--- a/package/mdadm/patches/patch-Makefile
+++ b/package/mdadm/patches/patch-Makefile
@@ -1,5 +1,14 @@
---- mdadm-3.0.orig/Makefile 2009-06-02 07:48:29.000000000 +0200
-+++ mdadm-3.0/Makefile 2010-01-16 09:36:14.000000000 +0100
+--- mdadm-3.1.1.orig/Makefile 2009-11-16 23:55:41.000000000 +0100
++++ mdadm-3.1.1/Makefile 2010-02-06 01:09:39.963074463 +0100
+@@ -42,7 +42,7 @@ KLIBC_GCC = gcc -nostdinc -iwithprefix i
+
+ CC = $(CROSS_COMPILE)gcc
+ CXFLAGS = -ggdb
+-CWFLAGS = -Wall -Werror -Wstrict-prototypes
++CWFLAGS = -Wall -Wstrict-prototypes
+ ifdef WARN_UNUSED
+ CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O
+ endif
@@ -58,7 +58,8 @@ CONFFILE = $(SYSCONFDIR)/mdadm.conf
CONFFILE2 = $(SYSCONFDIR)/mdadm/mdadm.conf
MAILCMD =/usr/sbin/sendmail -t
@@ -17,8 +26,8 @@
- $(INSTALL) -D $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm
- $(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon
+ $(INSTALL) -d $(DESTDIR)$(BINDIR)
-+ $(INSTALL) $(STRIP) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm
-+ $(INSTALL) $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon
++ $(INSTALL) -m 755 mdadm $(DESTDIR)$(BINDIR)/mdadm
++ $(INSTALL) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon
install-static : mdadm.static install-man
- $(INSTALL) -D $(STRIP) -m 755 mdadm.static $(DESTDIR)$(BINDIR)/mdadm
diff --git a/package/mdadm/patches/patch-platform-intel_c b/package/mdadm/patches/patch-platform-intel_c
index 1e6e113a1..3102306e7 100644
--- a/package/mdadm/patches/patch-platform-intel_c
+++ b/package/mdadm/patches/patch-platform-intel_c
@@ -1,5 +1,5 @@
---- mdadm-3.0.orig/platform-intel.c 2009-06-02 07:48:29.000000000 +0200
-+++ mdadm-3.0/platform-intel.c 2009-09-02 19:30:09.000000000 +0200
+--- mdadm-3.1.1.orig/platform-intel.c 2009-11-16 23:55:41.000000000 +0100
++++ mdadm-3.1.1/platform-intel.c 2010-02-06 01:07:51.781825419 +0100
@@ -47,6 +47,7 @@ struct sys_dev *find_driver_devices(cons
char path[256];
char link[256];
@@ -18,8 +18,8 @@
+ list->path = realpath(path, rpath);
list->next = NULL;
}
-
-@@ -198,9 +201,11 @@ const struct imsm_orom *find_imsm_orom(v
+ closedir(driver_dir);
+@@ -203,9 +206,11 @@ const struct imsm_orom *find_imsm_orom(v
char *devt_to_devpath(dev_t dev)
{
char device[40];