From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 3/6] mdadm: Update to 4.1
Date: Sat, 04 Jan 2020 16:49:13 +0000
Message-ID: <20200104164916.12051-3-michael.tremer@ipfire.org>
In-Reply-To: <20200104164916.12051-1-michael.tremer@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2674141730464141981=="
List-Id: <development.lists.ipfire.org>

--===============2674141730464141981==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
---
 config/rootfiles/common/mdadm |  4 +++-
 lfs/mdadm                     |  6 +++---
 src/patches/mdadm/gcc-7.patch | 12 ------------
 3 files changed, 6 insertions(+), 16 deletions(-)
 delete mode 100644 src/patches/mdadm/gcc-7.patch

diff --git a/config/rootfiles/common/mdadm b/config/rootfiles/common/mdadm
index 00d38a8c8..08d422b94 100644
--- 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/69-md-clustered-confirm-device.rules
 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
-srv/web/ipfire/cgi-bin/mdstat.cgi
diff --git a/lfs/mdadm b/lfs/mdadm
index 3e8444cbf..19d678f93 100644
--- a/lfs/mdadm
+++ b/lfs/mdadm
@@ -24,7 +24,7 @@
=20
 include Config
=20
-VER        =3D 4.0
+VER        =3D 4.1
=20
 THISAPP    =3D mdadm-$(VER)
 DL_FILE    =3D $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects =3D $(DL_FILE)
=20
 $(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_MD5 =3D 2cb4feffea9167ba71b5f346a0c0a40d
+$(DL_FILE)_MD5 =3D 51bf3651bd73a06c413a2f964f299598
=20
 install : $(TARGET)
=20
@@ -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)
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/mdadm/gcc-7.patch
+	cd $(DIR_APP) && sed 's(a)-Werror@@' -i Makefile
 	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
index 20606d21f..000000000
--- 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 @@
-=20
- CC ?=3D $(CROSS_COMPILE)gcc
- CXFLAGS ?=3D -ggdb
--CWFLAGS =3D -Wall -Werror -Wstrict-prototypes -Wextra -Wno-unused-parameter
-+CWFLAGS =3D -Wall -Werror -Werror=3Dimplicit-fallthrough=3D0 -Werror=3Dform=
at-overflow=3D0 -Werror=3Dformat-truncation=3D0 -Wstrict-prototypes -Wextra -=
Wno-unused-parameter
- ifdef WARN_UNUSED
- CWFLAGS +=3D -Wp,-D_FORTIFY_SOURCE=3D2 -O3
- endif
--=20
2.20.1


--===============2674141730464141981==--