From 5c11b11b58a407c8ad1983c8253d65c61f8dce28 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 25 May 2019 15:03:47 +0200 Subject: [PATCH 1/4] lvm2: drop unused patch --- pkgs/os-specific/linux/lvm2/default.nix | 1 - pkgs/os-specific/linux/lvm2/purity.patch | 44 ------------------------ 2 files changed, 45 deletions(-) delete mode 100644 pkgs/os-specific/linux/lvm2/purity.patch diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 9944250bf30..50d0bd1f258 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -44,7 +44,6 @@ stdenv.mkDerivation { # gcc: error: ../../device_mapper/libdevice-mapper.a: No such file or directory enableParallelBuilding = false; - #patches = [ ./purity.patch ]; patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ (fetchpatch { name = "fix-stdio-usage.patch"; diff --git a/pkgs/os-specific/linux/lvm2/purity.patch b/pkgs/os-specific/linux/lvm2/purity.patch deleted file mode 100644 index d6990dd9caa..00000000000 --- a/pkgs/os-specific/linux/lvm2/purity.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -ru LVM2.2.02.95-orig/udev/10-dm.rules.in LVM2.2.02.95/udev/10-dm.rules.in ---- LVM2.2.02.95-orig/udev/10-dm.rules.in 2011-08-11 19:55:29.000000000 +0200 -+++ LVM2.2.02.95/udev/10-dm.rules.in 2012-03-19 20:12:35.000000000 +0100 -@@ -19,9 +19,8 @@ - SUBSYSTEM!="block", GOTO="dm_end" - KERNEL!="dm-[0-9]*", GOTO="dm_end" - --# Set proper sbin path, /sbin has higher priority than /usr/sbin. --ENV{DM_SBIN_PATH}="/sbin" --TEST!="$env{DM_SBIN_PATH}/dmsetup", ENV{DM_SBIN_PATH}="/usr/sbin" -+# Set proper sbin path. Exit if dmsetup is not present. -+ENV{DM_SBIN_PATH}="(sbindir)" - TEST!="$env{DM_SBIN_PATH}/dmsetup", GOTO="dm_end" - - # Device created, major and minor number assigned - "add" event generated. -diff -ru LVM2.2.02.95-orig/udev/Makefile.in LVM2.2.02.95/udev/Makefile.in ---- LVM2.2.02.95-orig/udev/Makefile.in 2012-02-24 10:53:12.000000000 +0100 -+++ LVM2.2.02.95/udev/Makefile.in 2012-03-19 20:16:09.000000000 +0100 -@@ -12,6 +12,7 @@ - # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - srcdir = @srcdir@ -+sbindir = @sbindir@ - top_srcdir = @top_srcdir@ - top_builddir = @top_builddir@ - -@@ -26,7 +27,7 @@ - ifeq ("@UDEV_HAS_BUILTIN_BLKID@", "yes") - BLKID_RULE=IMPORT{builtin}=\"blkid\" - else -- BLKID_RULE=IMPORT{program}=\"\$$env{DM_SBIN_PATH}\/blkid -o udev -p \$$tempnode\" -+ BLKID_RULE=IMPORT{program}=\"\/sbin\/blkid -o udev -p \$$tempnode\" - endif - - CLEAN_TARGETS = 10-dm.rules 13-dm-disk.rules -@@ -36,7 +37,7 @@ - vpath %.rules $(srcdir) - - %.rules: %.rules.in -- $(SED) -e "s/(DM_DIR)/$(DM_DIR)/" -e "s/(BLKID_RULE)/$(BLKID_RULE)/" $< >$@ -+ $(SED) -e "s/(DM_DIR)/$(DM_DIR)/" -e "s/(BLKID_RULE)/$(BLKID_RULE)/" -e "s|(sbindir)|$(sbindir)|" $< >$@ - - %_install: %.rules - $(INSTALL_DATA) -D $< $(udevdir)/$( Date: Sat, 25 May 2019 15:03:58 +0200 Subject: [PATCH 2/4] lvm2: enable parallel building --- pkgs/os-specific/linux/lvm2/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 50d0bd1f258..bf5aa88f5bb 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -41,8 +41,7 @@ stdenv.mkDerivation { sed -i /DEFAULT_PROFILE_DIR/d conf/Makefile.in ''; - # gcc: error: ../../device_mapper/libdevice-mapper.a: No such file or directory - enableParallelBuilding = false; + enableParallelBuilding = true; patches = stdenv.lib.optionals stdenv.hostPlatform.isMusl [ (fetchpatch { From 0489025cabc62a6cfa5601abdde2cc32001f9a81 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 25 May 2019 15:04:12 +0200 Subject: [PATCH 3/4] lvm2: allow building with systemd = null The closure still picks up systemd via udev, however, overriding with eudev is necessary to avoid the reference. --- pkgs/os-specific/linux/lvm2/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index bf5aa88f5bb..d6522e60e9e 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation { preConfigure = '' - substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \ - --replace /usr/bin/udevadm ${systemd}/bin/udevadm - sed -i /DEFAULT_SYS_DIR/d Makefile.in sed -i /DEFAULT_PROFILE_DIR/d conf/Makefile.in + '' + stdenv.lib.optionalString (systemd != null) '' + substituteInPlace scripts/lvm2_activation_generator_systemd_red_hat.c \ + --replace /usr/bin/udevadm ${systemd}/bin/udevadm ''; enableParallelBuilding = true; @@ -73,7 +73,7 @@ stdenv.mkDerivation { '' substituteInPlace $out/lib/udev/rules.d/13-dm-disk.rules \ --replace $out/sbin/blkid ${utillinux}/sbin/blkid - + '' + stdenv.lib.optionalString (systemd != null) '' # Systemd stuff mkdir -p $out/etc/systemd/system $out/lib/systemd/system-generators cp scripts/blk_availability_systemd_red_hat.service $out/etc/systemd/system From ecd693153f2b7e42e2e6a8d5916e86749a490a5c Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sun, 13 Oct 2019 13:06:59 +0200 Subject: [PATCH 4/4] lvm2: silence warning about unrecognized configure flag --enable-applib has been removed. --- pkgs/os-specific/linux/lvm2/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index d6522e60e9e..d5b45117732 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -21,7 +21,6 @@ stdenv.mkDerivation { "--enable-udev_rules" "--enable-udev_sync" "--enable-pkgconfig" - "--enable-applib" "--enable-cmdlib" ] ++ stdenv.lib.optional enable_dmeventd " --enable-dmeventd" ++ stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [