Skip to content
Permalink
Browse files

mdadm: Update to 4.1

Tested on GnuBee PC1.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
  • Loading branch information...
neheb authored and hauke committed Feb 14, 2019
1 parent f5db574 commit cd519abdbc412719c5af6ab3181e7a4b3fa50878
@@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=mdadm
PKG_VERSION:=4.0
PKG_RELEASE:=5
PKG_VERSION:=4.1
PKG_RELEASE:=1

PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_SOURCE_URL:=@KERNEL/linux/utils/raid/mdadm
PKG_HASH:=1d6ae7f24ced3a0fa7b5613b32f4a589bb4881e3946a5a2c3724056254ada3a9
PKG_HASH:=ab7688842908d3583a704d491956f31324c3a5fc9f6a04653cb75d19f1934f4a

PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
PKG_CPE_ID:=cpe:/a:mdadm_project:mdadm
@@ -1,11 +1,11 @@
--- a/Makefile
+++ b/Makefile
@@ -86,7 +86,7 @@ DLM:=$(shell [ -f /usr/include/libdlm.h
@@ -97,7 +97,7 @@ DLM:=$(shell [ -f /usr/include/libdlm.h ] || echo -DNO_DLM)
DIRFLAGS = -DMAP_DIR=\"$(MAP_DIR)\" -DMAP_FILE=\"$(MAP_FILE)\"
DIRFLAGS += -DMDMON_DIR=\"$(MDMON_DIR)\"
DIRFLAGS += -DFAILED_SLOTS_DIR=\"$(FAILED_SLOTS_DIR)\"
-CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) $(DIRFLAGS) $(COROSYNC) $(DLM)
+# CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) $(DIRFLAGS) $(COROSYNC) $(DLM)
+#CFLAGS = $(CWFLAGS) $(CXFLAGS) -DSendmail=\""$(MAILCMD)"\" $(CONFFILEFLAGS) $(DIRFLAGS) $(COROSYNC) $(DLM)

VERSION = $(shell [ -d .git ] && git describe HEAD | sed 's/mdadm-//')
VERS_DATE = $(shell [ -d .git ] && date --date="`git log -n1 --format=format:%cd --date=short`" '+%0dth %B %Y' | sed -e 's/1th/1st/' -e 's/2th/2nd/' -e 's/11st/11th/' -e 's/12nd/12th/')
VERS_DATE = $(shell [ -d .git ] && date --iso-8601 --date="`git log -n1 --format=format:%cd --date=iso --date=short`")
@@ -22,7 +22,7 @@ Upstream-Status: Pending

--- a/mdadm.h
+++ b/mdadm.h
@@ -1595,11 +1595,13 @@ static inline char *to_subarray(struct m
@@ -1649,11 +1649,13 @@ static inline char *to_subarray(struct m
}

#ifdef DEBUG
@@ -1,6 +1,6 @@
--- a/Incremental.c
+++ b/Incremental.c
@@ -1642,6 +1642,10 @@ static int Incremental_container(struct
@@ -1619,6 +1619,10 @@ static int Incremental_container(struct supertype *st, char *devname,
if (ra_all == ra_blocked)
return 0;

@@ -13,13 +13,13 @@
memcpy(suuid, uuid_zero, sizeof(int[4]));
--- a/util.c
+++ b/util.c
@@ -1151,7 +1151,9 @@ void wait_for(char *dev, int fd)
@@ -1220,7 +1220,9 @@ void wait_for(char *dev, int fd)
struct superswitch *superlist[] =
{
&super0, &super1,
+#ifdef MDADM_FULL
&super_ddf, &super_imsm,
+#endif
&mbr, &gpt,
NULL };

NULL
};

0 comments on commit cd519ab

Please sign in to comment.
You can’t perform that action at this time.