Merge pull request #27548 from roberth/lvm-update

lvm2: 2.02.140 -> 2.02.173
This commit is contained in:
Graham Christensen 2017-07-22 09:16:59 -04:00 committed by GitHub
commit 2fb3cc1e6d

View File

@ -2,7 +2,7 @@
, thin-provisioning-tools, enable_dmeventd ? false }: , thin-provisioning-tools, enable_dmeventd ? false }:
let let
version = "2.02.140"; version = "2.02.173";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -10,7 +10,7 @@ stdenv.mkDerivation {
src = fetchurl { src = fetchurl {
url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${version}.tgz"; url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${version}.tgz";
sha256 = "1jd46diyv7074fw8kxwq7imn4pl76g01d8y7z4scq0lkxf8jmpai"; sha256 = "0r4dx87z7ggxmxligdzz43chgfrwn9lyj7vaz63z97h0gs61dfff";
}; };
configureFlags = [ configureFlags = [
@ -27,10 +27,7 @@ stdenv.mkDerivation {
preConfigure = preConfigure =
'' ''
substituteInPlace scripts/lvmdump.sh \
--replace /usr/bin/tr ${coreutils}/bin/tr
substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \ substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \
--replace /usr/sbin/lvm $out/sbin/lvm \
--replace /usr/bin/udevadm ${systemd.udev.bin}/bin/udevadm --replace /usr/bin/udevadm ${systemd.udev.bin}/bin/udevadm
sed -i /DEFAULT_SYS_DIR/d Makefile.in sed -i /DEFAULT_SYS_DIR/d Makefile.in