From b3d3a4c9e13b8a36ea8d2954d6802521bac17dc0 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Tue, 2 Feb 2021 19:05:25 -0500 Subject: [PATCH] zfs: update to 2.0.2. --- srcpkgs/zfs/patches/dkms.patch | 8 ++++---- srcpkgs/zfs/template | 6 ++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/srcpkgs/zfs/patches/dkms.patch b/srcpkgs/zfs/patches/dkms.patch index da097a96ff3..866cac25dab 100644 --- a/srcpkgs/zfs/patches/dkms.patch +++ b/srcpkgs/zfs/patches/dkms.patch @@ -2,9 +2,9 @@ # Avoids recompiling ZFS userland utilities with DKMS rebuilds # Also short-circuits a useless test for Debian in the DKMS source ---- a/scripts/dkms.mkconf 2020-05-05 12:56:14.424687887 -0400 -+++ b/scripts/dkms.mkconf 2020-08-12 10:20:16.673372895 -0400 -@@ -25,22 +25,7 @@ +--- scripts/dkms.mkconf 2021-01-19 19:19:08.000000000 -0500 ++++ scripts/dkms.mkconf 2021-02-02 19:03:02.045984881 -0500 +@@ -26,22 +26,7 @@ PRE_BUILD="configure --prefix=/usr --with-config=kernel @@ -28,7 +28,7 @@ --with-linux-obj=\${kernel_source_dir} \$( [[ -n \"\${ICP_ROOT}\" ]] && \\ -@@ -74,7 +59,7 @@ +@@ -75,7 +60,7 @@ " AUTOINSTALL="yes" REMAKE_INITRD="no" diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template index 1af53405226..544f80c8658 100644 --- a/srcpkgs/zfs/template +++ b/srcpkgs/zfs/template @@ -1,6 +1,6 @@ # Template file for 'zfs' pkgname=zfs -version=2.0.1 +version=2.0.2 revision=1 build_style=gnu-configure configure_args="--with-config=user --with-mounthelperdir=/usr/bin @@ -15,9 +15,7 @@ maintainer="Toyam Cox " license="CDDL-1.0" homepage="https://openzfs.github.io/openzfs-docs/" distfiles="https://github.com/openzfs/zfs/releases/download/zfs-${version}/zfs-${version}.tar.gz" -checksum=71510a6381d9910d75fa52d7bbf0863aa80ff88f337c8a023e267f4ba8486978 - -patch_args="-Np1" +checksum=bde5067ce4577d26cc0f0313a09173ad40d590d01539b92c93f33f06ee150b24 replaces="spl<=0.7.13_1" # Because SPL was merged into zfs in 0.8.0