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 [thread overview]
Message-ID: <20200104164916.12051-3-michael.tremer@ipfire.org> (raw)
In-Reply-To: <20200104164916.12051-1-michael.tremer@ipfire.org>
[-- Attachment #1: Type: text/plain, Size: 2570 bytes --]
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 @@
include Config
-VER = 4.0
+VER = 4.1
THISAPP = mdadm-$(VER)
DL_FILE = $(THISAPP).tar.xz
@@ -40,7 +40,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 2cb4feffea9167ba71b5f346a0c0a40d
+$(DL_FILE)_MD5 = 51bf3651bd73a06c413a2f964f299598
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)
- 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 @@
-
- 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
--
2.20.1
next prev parent reply other threads:[~2020-01-04 16:49 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-04 16:49 [PATCH 1/6] mpfr: Update to 4.0.2 Michael Tremer
2020-01-04 16:49 ` [PATCH 2/6] mpc: Update to 1.1.0 Michael Tremer
2020-01-04 16:49 ` Michael Tremer [this message]
2020-01-04 16:49 ` [PATCH 4/6] efivar: Update to 37 Michael Tremer
2020-01-04 16:49 ` [PATCH 5/6] glib: Fix compiling with GCC 9 Michael Tremer
2020-01-04 16:49 ` [PATCH 6/6] openvmtools: Update to 11.0.0 Michael Tremer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200104164916.12051-3-michael.tremer@ipfire.org \
--to=michael.tremer@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox