From patchwork Sat Jan 4 16:49:13 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tremer X-Patchwork-Id: 2677 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 47qnmp1Sdwz3xY5 for ; Sat, 4 Jan 2020 16:49:30 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 47qnml1Wghz4Qc; Sat, 4 Jan 2020 16:49:27 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 47qnmk3WmGz2yd6; Sat, 4 Jan 2020 16:49:26 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 47qnmh4WRqz2xdK for ; Sat, 4 Jan 2020 16:49:24 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (Client did not present a certificate) by mail01.ipfire.org (Postfix) with ESMTPSA id 47qnmh0Qbnz4PG; Sat, 4 Jan 2020 16:49:24 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909ed25519; t=1578156564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QhMmUuiA5jIB1xfI5zp2zBsk0a/j2MbGAS8kUzmM/lU=; b=r1TA7Dj3lS3uCBBoptpm2AGYPeGjdJdEBUSJi3586yEQ/ppUKpyIwUL1guYijto8vzhH4p pvEZDkkk/Lcf/lCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=201909rsa; t=1578156564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QhMmUuiA5jIB1xfI5zp2zBsk0a/j2MbGAS8kUzmM/lU=; b=aXX1OOlrRV1Zmv2tMjiOozISoGAzM1dhBFxHvFR5AbMpJX+D/UVctqZpdia2ClQ0wDjcWz 6HBTTeMb61Gr8MPBbUIPVv3Fnb1z9/v+jbrM2jFYb4gjgZ1V9/9p4fJsYN3rgX7XW/rEZJ G8MV+8a9iOTRbXY7wIMMQ+xcU1DyBl9rq4/OlQbku4VbGlcJb6gNE0SQ9X42mRBrDc8hSb kpGC4/7o3fZjUCq29S0XWyF+QErVz8cfddWDYQ+cQohmXKYkI9U+Nm/qeZuuX+WcZW7RV2 h34+E1M9zax6lFAow4f5VKGIFZMPG3E4SnMOvHlppPgD/6o2oFJh5L2vPlOFeg== From: Michael Tremer To: development@lists.ipfire.org Subject: [PATCH 3/6] mdadm: Update to 4.1 Date: Sat, 4 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> References: <20200104164916.12051-1-michael.tremer@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Michael Tremer Errors-To: development-bounces@lists.ipfire.org Sender: "Development" Signed-off-by: Michael Tremer --- 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@-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