mirror of
https://github.com/Heleguo/lede.git
synced 2025-12-17 11:21:27 +00:00
mdadm: update to 4.4 (#13694)
This commit is contained in:
parent
5974396acc
commit
8348c7faba
@ -8,17 +8,18 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=mdadm
|
||||
PKG_VERSION:=4.2
|
||||
PKG_RELEASE:=2
|
||||
PKG_VERSION:=4.4
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
|
||||
PKG_SOURCE_URL:=@KERNEL/linux/utils/raid/mdadm
|
||||
PKG_HASH:=461c215670864bb74a4d1a3620684aa2b2f8296dffa06743f26dda5557acf01d
|
||||
PKG_HASH:=9b488f35ed153df99924b5fe41eed380e8512de8f18a118628cacdd681b1d573
|
||||
|
||||
PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
|
||||
PKG_CPE_ID:=cpe:/a:mdadm_project:mdadm
|
||||
|
||||
PKG_BUILD_PARALLEL:=1
|
||||
PKG_BUILD_FLAGS:=gc-sections
|
||||
|
||||
include $(INCLUDE_DIR)/package.mk
|
||||
|
||||
@ -43,7 +44,6 @@ define Package/mdadm/conffiles
|
||||
endef
|
||||
|
||||
TARGET_CFLAGS += \
|
||||
-ffunction-sections -fdata-sections \
|
||||
-DHAVE_STDINT_H -DNO_COROSYNC -DNO_DLM -DUSE_PTHREADS \
|
||||
-DCONFFILE='\"/var/etc/mdadm.conf\"' \
|
||||
-DMAP_DIR='\"/var/run/mdadm\"' \
|
||||
@ -54,8 +54,6 @@ TARGET_CFLAGS += \
|
||||
|
||||
TARGET_CXFLAGS = -DNO_LIBUDEV
|
||||
|
||||
TARGET_LDFLAGS += -Wl,--gc-sections
|
||||
|
||||
MAKE_FLAGS += \
|
||||
CHECK_RUN_DIR=0 \
|
||||
CXFLAGS="$(TARGET_CXFLAGS)"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -99,7 +99,7 @@ DLM:=$(shell [ -f /usr/include/libdlm.h
|
||||
@@ -136,7 +136,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)\"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
--- a/Incremental.c
|
||||
+++ b/Incremental.c
|
||||
@@ -983,6 +983,10 @@ static int array_try_spare(char *devname
|
||||
@@ -993,6 +993,10 @@ static int array_try_spare(char *devname, int *dfdp, struct dev_policy *pol,
|
||||
goto next;
|
||||
}
|
||||
|
||||
@ -13,7 +13,7 @@
|
||||
/* domain test fails */
|
||||
--- a/util.c
|
||||
+++ b/util.c
|
||||
@@ -1147,7 +1147,9 @@ void wait_for(char *dev, int fd)
|
||||
@@ -1162,7 +1162,9 @@ void wait_for(char *dev, int fd)
|
||||
struct superswitch *superlist[] =
|
||||
{
|
||||
&super0, &super1,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user