Commit 2491be0a authored by Andrew Marshall's avatar Andrew Marshall
Browse files

zfs: update usage of deprecated `--replace` 

- In some cases, move into a conditional as the substitution is only
  needed on some version
- One use of `--replace-warn` since it is looking in a set of files
  where the exact files that might contain it may change over time, but
  we want to cover all of them
parent 17915e16

pkgs/os-specific/linux/zfs/generic.nix

+17 −17
Original line number Diff line number Diff line
@@ -69,39 +69,39 @@ let 
      # The arrays must remain the same length, so we repeat a flag that is

      # already part of the command and therefore has no effect.

      substituteInPlace ./module/os/linux/zfs/zfs_ctldir.c \

        --replace '"/usr/bin/env", "umount"' '"${util-linux}/bin/umount", "-n"' \

        --replace '"/usr/bin/env", "mount"'  '"${util-linux}/bin/mount", "-n"'

        --replace-fail '"/usr/bin/env", "umount"' '"${util-linux}/bin/umount", "-n"' \

        --replace-fail '"/usr/bin/env", "mount"'  '"${util-linux}/bin/mount", "-n"'

    '' + optionalString buildUser ''

      substituteInPlace ./lib/libshare/os/linux/nfs.c --replace "/usr/sbin/exportfs" "${

      substituteInPlace ./lib/libshare/os/linux/nfs.c --replace-fail "/usr/sbin/exportfs" "${

        # We don't *need* python support, but we set it like this to minimize closure size:

        # If it's disabled by default, no need to enable it, even if we have python enabled

        # And if it's enabled by default, only change that if we explicitly disable python to remove python from the closure

        nfs-utils.override (old: { enablePython = old.enablePython or true && enablePython; })

      }/bin/exportfs"

      substituteInPlace ./lib/libshare/smb.h        --replace "/usr/bin/net"            "${samba}/bin/net"

      substituteInPlace ./lib/libshare/smb.h        --replace-fail "/usr/bin/net"            "${samba}/bin/net"

      # Disable dynamic loading of libcurl

      substituteInPlace ./config/user-libfetch.m4   --replace "curl-config --built-shared" "true"

      substituteInPlace ./config/user-systemd.m4    --replace "/usr/lib/modules-load.d" "$out/etc/modules-load.d"

      substituteInPlace ./config/zfs-build.m4       --replace "\$sysconfdir/init.d"     "$out/etc/init.d" \

                                                    --replace "/etc/default"            "$out/etc/default"

      substituteInPlace ./config/user-libfetch.m4   --replace-fail "curl-config --built-shared" "true"

      substituteInPlace ./config/user-systemd.m4    --replace-fail "/usr/lib/modules-load.d" "$out/etc/modules-load.d"

      substituteInPlace ./config/zfs-build.m4       --replace-fail "\$sysconfdir/init.d"     "$out/etc/init.d" \

                                                    --replace-fail "/etc/default"            "$out/etc/default"

      substituteInPlace ./contrib/initramfs/Makefile.am \

        --replace "/usr/share/initramfs-tools" "$out/usr/share/initramfs-tools"

        --replace-fail "/usr/share/initramfs-tools" "$out/usr/share/initramfs-tools"

    '' + optionalString isAtLeast22Series ''

      substituteInPlace ./udev/vdev_id \

        --replace "PATH=/bin:/sbin:/usr/bin:/usr/sbin" \

        --replace-fail "PATH=/bin:/sbin:/usr/bin:/usr/sbin" \

         "PATH=${makeBinPath [ coreutils gawk gnused gnugrep systemd ]}"



      substituteInPlace ./config/zfs-build.m4 \

        --replace-fail "bashcompletiondir=/etc/bash_completion.d" \

          "bashcompletiondir=$out/share/bash-completion/completions"

    '' + optionalString (!isAtLeast22Series) ''

      substituteInPlace ./etc/zfs/Makefile.am --replace "\$(sysconfdir)/zfs" "$out/etc/zfs"

      substituteInPlace ./etc/zfs/Makefile.am --replace-fail "\$(sysconfdir)/zfs" "$out/etc/zfs"



      find ./contrib/initramfs -name Makefile.am -exec sed -i -e 's|/usr/share/initramfs-tools|'$out'/share/initramfs-tools|g' {} \;



      substituteInPlace ./cmd/vdev_id/vdev_id \

        --replace "PATH=/bin:/sbin:/usr/bin:/usr/sbin" \

        --replace-fail "PATH=/bin:/sbin:/usr/bin:/usr/sbin" \

        "PATH=${makeBinPath [ coreutils gawk gnused gnugrep systemd ]}"

    '' + ''

      substituteInPlace ./config/zfs-build.m4 \

        --replace "bashcompletiondir=/etc/bash_completion.d" \

          "bashcompletiondir=$out/share/bash-completion/completions"

    '';



    nativeBuildInputs = [ autoreconfHook269 nukeReferences ]
@@ -176,7 +176,7 @@ let 
           continue

         fi

         sed -i '/zfs-import-scan.service/d' $i

         substituteInPlace $i --replace "zfs-import-cache.service" "zfs-import.target"

         substituteInPlace $i --replace-warn "zfs-import-cache.service" "zfs-import.target"

      done



      # Remove tests because they add a runtime dependency on gcc