diff options
| author | William A. Kennington III <william@wkennington.com> | 2013-11-20 12:39:17 -0600 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2013-11-28 00:52:12 -0600 |
| commit | 47c3272b1f3e8d32409842a282d2210da0bdb6a7 (patch) | |
| tree | 8529d1b542aff77db8f7d5c544cbb60e4ca11879 /pkgs/os-specific/linux/mdadm | |
| parent | fb7421db64532ac23c8dfd5ebddd05ac1de3cf14 (diff) | |
| download | nixpkgs-47c3272b1f3e8d32409842a282d2210da0bdb6a7.tar nixpkgs-47c3272b1f3e8d32409842a282d2210da0bdb6a7.tar.gz nixpkgs-47c3272b1f3e8d32409842a282d2210da0bdb6a7.tar.bz2 nixpkgs-47c3272b1f3e8d32409842a282d2210da0bdb6a7.tar.lz nixpkgs-47c3272b1f3e8d32409842a282d2210da0bdb6a7.tar.xz nixpkgs-47c3272b1f3e8d32409842a282d2210da0bdb6a7.tar.zst nixpkgs-47c3272b1f3e8d32409842a282d2210da0bdb6a7.zip | |
Update MDadm from 3.1.2 -> 3.3
Additionally, remove the old udev patch since this version has a rule for enabling mdraid arrays
Diffstat (limited to 'pkgs/os-specific/linux/mdadm')
| -rw-r--r-- | pkgs/os-specific/linux/mdadm/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/mdadm/udev.patch | 20 |
2 files changed, 3 insertions, 26 deletions
diff --git a/pkgs/os-specific/linux/mdadm/default.nix b/pkgs/os-specific/linux/mdadm/default.nix index 1653c018ce1..48e1c178490 100644 --- a/pkgs/os-specific/linux/mdadm/default.nix +++ b/pkgs/os-specific/linux/mdadm/default.nix @@ -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 diff --git a/pkgs/os-specific/linux/mdadm/udev.patch b/pkgs/os-specific/linux/mdadm/udev.patch deleted file mode 100644 index 5eb35f0c584..00000000000 --- a/pkgs/os-specific/linux/mdadm/udev.patch +++ /dev/null @@ -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" |