dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Update MDadm from 3.1.2 -> 3.3

Browse Source 
Additionally, remove the old udev patch since this version has a rule
for enabling mdraid arrays
This commit is contained in:
William A. Kennington III 2013-11-20 12:39:17 -06:00
parent fb7421db64
commit 47c3272b1f
2 changed files with 3 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/os-specific/linux/mdadm/default.nix
View File

@ -1,16 +1,13 @@
{ stdenv, fetchurl, groff }:
stdenv.mkDerivation rec {
name = "mdadm-3.1.2";
name = "mdadm-3.3";
src = fetchurl {
url = "mirror://kernel/linux/utils/raid/mdadm/${name}.tar.bz2";
sha256 = "0s2d2a01j8cizxqvbgd0sn5bpa1j46q8976078b3jq1q7i1ir0zz";
sha256 = "0igdqflihiq1dp5qlypzw0xfl44f4n3bckl7r2x2wfgkplcfa1ww";
};
# Enable incremental activation of swraid arrays from udev.
patches = [ ./udev.patch ];
nativeBuildInputs = [ groff ];
preConfigure = "sed -e 's@/lib/udev@\${out}/lib/udev@' -e 's@ -Werror @ @' -i Makefile";
@ -19,7 +16,7 @@ stdenv.mkDerivation rec {
# /dev/.mdadm/map as a fallback).
preBuild =
''
makeFlagsArray=(INSTALL=install BINDIR=$out/sbin MANDIR=$out/share/man VAR_RUN=/var/run/mdadm ALT_RUN=/dev/.mdadm)
makeFlagsArray=(INSTALL=install BINDIR=$out/sbin MANDIR=$out/share/man RUN_DIR=/dev/.mdadm)
if [[ -n "$crossConfig" ]]; then
makeFlagsArray+=(CROSS_COMPILE=$crossConfig-)
fi

20
pkgs/os-specific/linux/mdadm/udev.patch
View File

@ -1,20 +0,0 @@
diff --exclude '*~' -rc mdadm-3.1.2-orig/udev-md-raid.rules mdadm-3.1.2/udev-md-raid.rules
*** mdadm-3.1.2-orig/udev-md-raid.rules 2010-02-22 21:14:58.000000000 +0100
--- mdadm-3.1.2/udev-md-raid.rules 2010-05-16 20:45:22.000000000 +0200
***************
*** 5,11 ****
ACTION=="change", GOTO="md_no_incr"
# import data from a raid member and activate it
! #ENV{ID_FS_TYPE}=="linux_raid_member", IMPORT{program}="/sbin/mdadm --examine --export $tempnode", RUN+="/sbin/mdadm --incremental $env{DEVNAME}"
# import data from a raid set
LABEL="md_no_incr"
KERNEL!="md*", GOTO="md_end"
--- 5,11 ----
ACTION=="change", GOTO="md_no_incr"
# import data from a raid member and activate it
! ENV{ID_FS_TYPE}=="linux_raid_member", IMPORT{program}="/sbin/mdadm --examine --export $tempnode", RUN+="/sbin/mdadm --incremental $env{DEVNAME}"
# import data from a raid set
LABEL="md_no_incr"
KERNEL!="md*", GOTO="md_end"