mdadm: Update to 4.1

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/rootfiles/common/mdadm b/config/rootfiles/common/mdadm
index 00d38a8c864ca35cf98458a25548a7ea1dff1950..08d422b9406f7fb1ca22c4d6bb31a40331cbf7d9 100644 (file)
--- a/config/rootfiles/common/mdadm
+++ b/config/rootfiles/common/mdadm
@@ -1,9 +1,11 @@
+lib/udev/rules.d/01-md-raid-creating.rules

 lib/udev/rules.d/63-md-raid-arrays.rules
 lib/udev/rules.d/64-md-raid-assembly.rules
 lib/udev/rules.d/63-md-raid-arrays.rules
 lib/udev/rules.d/64-md-raid-assembly.rules

+lib/udev/rules.d/69-md-clustered-confirm-device.rules

 sbin/mdadm
 sbin/mdmon
 sbin/mdadm
 sbin/mdmon

+srv/web/ipfire/cgi-bin/mdstat.cgi

 #usr/share/man/man4/md.4
 #usr/share/man/man5/mdadm.conf.5
 #usr/share/man/man8/mdadm.8
 #usr/share/man/man8/mdmon.8
 #usr/share/man/man4/md.4
 #usr/share/man/man5/mdadm.conf.5
 #usr/share/man/man8/mdadm.8
 #usr/share/man/man8/mdmon.8

-srv/web/ipfire/cgi-bin/mdstat.cgi

diff --git a/lfs/mdadm b/lfs/mdadm
index 3e8444cbf5558b89f5bf202569c410f3d1bb60b4..19d678f93385552a3cd4d3ce1b3ef7d516217b18 100644 (file)
--- a/lfs/mdadm
+++ b/lfs/mdadm
@@ -24,7 +24,7 @@
 
 include Config
 
 
 include Config
 

-VER        = 4.0
+VER        = 4.1

 
 THISAPP    = mdadm-$(VER)
 DL_FILE    = $(THISAPP).tar.xz
 
 THISAPP    = mdadm-$(VER)
 DL_FILE    = $(THISAPP).tar.xz


@@ -40,7 +40,7 @@ objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 

-$(DL_FILE)_MD5 = 2cb4feffea9167ba71b5f346a0c0a40d
+$(DL_FILE)_MD5 = 51bf3651bd73a06c413a2f964f299598

 
 install : $(TARGET)
 
 
 install : $(TARGET)
 


@@ -73,7 +73,7 @@ $(subst %,%_MD5,$(objects)) :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)

-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mdadm/gcc-7.patch
+       cd $(DIR_APP) && sed 's@-Werror@@' -i Makefile

        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
        @rm -rf $(DIR_APP)

diff --git a/src/patches/mdadm/gcc-7.patch b/src/patches/mdadm/gcc-7.patch
deleted file mode 100644 (file)
index 20606d2..0000000
--- a/src/patches/mdadm/gcc-7.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Naur mdadm-4.0.org/Makefile mdadm-4.0/Makefile
---- mdadm-4.0.org/Makefile     2017-01-09 22:46:34.000000000 +0100
-+++ mdadm-4.0/Makefile 2018-01-19 11:18:42.868219725 +0100
-@@ -43,7 +43,7 @@
- 
- CC ?= $(CROSS_COMPILE)gcc
- CXFLAGS ?= -ggdb
--CWFLAGS = -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter
-+CWFLAGS = -Wall -Werror -Werror=implicit-fallthrough=0 -Werror=format-overflow=0 -Werror=format-truncation=0 -Wstrict-prototypes -Wextra -Wno-unused-parameter
- ifdef WARN_UNUSED
- CWFLAGS += -Wp,-D_FORTIFY_SOURCE=2 -O3
- endif