From eb7508a1b2536d57d88a3beab44ae36dc3dd785e Mon Sep 17 00:00:00 2001 From: Zach Dykstra Date: Mon, 31 Jul 2023 10:29:20 -0500 Subject: [PATCH] zfs: update to 2.2.0. --- .../zfs/patches/0002-fix-dracut-root.patch | 56 ------------------- srcpkgs/zfs/patches/0002-fix-readmmap.c.patch | 12 ++++ srcpkgs/zfs/template | 17 ++++-- 3 files changed, 25 insertions(+), 60 deletions(-) delete mode 100644 srcpkgs/zfs/patches/0002-fix-dracut-root.patch create mode 100644 srcpkgs/zfs/patches/0002-fix-readmmap.c.patch diff --git a/srcpkgs/zfs/patches/0002-fix-dracut-root.patch b/srcpkgs/zfs/patches/0002-fix-dracut-root.patch deleted file mode 100644 index 384f08355f73f..0000000000000 --- a/srcpkgs/zfs/patches/0002-fix-dracut-root.patch +++ /dev/null @@ -1,56 +0,0 @@ -From eefe83eaa68f7cb4a49c580dd940d3688e42c849 Mon Sep 17 00:00:00 2001 -From: Toyam Cox -Date: Thu, 30 Jun 2022 13:47:58 -0400 -Subject: [PATCH] dracut: fix boot on non-zfs-root systems - -Simply prevent overwriting root until it needs to be overwritten. - -Dracut could change this value before this module is called, but won't -change the kernel command line. - -Reviewed-by: Andrew J. Hesford -Signed-off-by: Toyam Cox -Closes #13592 ---- - contrib/dracut/90zfs/zfs-lib.sh.in | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/contrib/dracut/90zfs/zfs-lib.sh.in b/contrib/dracut/90zfs/zfs-lib.sh.in -index e44673c2d75..3a43e514d6f 100755 ---- a/contrib/dracut/90zfs/zfs-lib.sh.in -+++ b/contrib/dracut/90zfs/zfs-lib.sh.in -@@ -88,11 +88,11 @@ decode_root_args() { - return - fi - -- root=$(getarg root=) -+ xroot=$(getarg root=) - rootfstype=$(getarg rootfstype=) - - # shellcheck disable=SC2249 -- case "$root" in -+ case "$xroot" in - ""|zfs|zfs:|zfs:AUTO) - root=zfs:AUTO - rootfstype=zfs -@@ -100,7 +100,7 @@ decode_root_args() { - ;; - - ZFS=*|zfs:*) -- root="${root#zfs:}" -+ root="${xroot#zfs:}" - root="${root#ZFS=}" - root=$(echo "$root" | tr '+' ' ') - rootfstype=zfs -@@ -109,9 +109,9 @@ decode_root_args() { - esac - - if [ "$rootfstype" = "zfs" ]; then -- case "$root" in -+ case "$xroot" in - "") root=zfs:AUTO ;; -- *) root=$(echo "$root" | tr '+' ' ') ;; -+ *) root=$(echo "$xroot" | tr '+' ' ') ;; - esac - return 0 - fi diff --git a/srcpkgs/zfs/patches/0002-fix-readmmap.c.patch b/srcpkgs/zfs/patches/0002-fix-readmmap.c.patch new file mode 100644 index 0000000000000..d807881d24a6d --- /dev/null +++ b/srcpkgs/zfs/patches/0002-fix-readmmap.c.patch @@ -0,0 +1,12 @@ +diff --git a/tests/zfs-tests/cmd/readmmap.c b/tests/zfs-tests/cmd/readmmap.c +index 704ffd55c..a5c8079d0 100644 +--- a/tests/zfs-tests/cmd/readmmap.c ++++ b/tests/zfs-tests/cmd/readmmap.c +@@ -44,6 +44,7 @@ + #include + #include + #include ++#include + #include + + int diff --git a/srcpkgs/zfs/template b/srcpkgs/zfs/template index a1a9ea8d16c83..3e64201a936c0 100644 --- a/srcpkgs/zfs/template +++ b/srcpkgs/zfs/template @@ -1,6 +1,6 @@ # Template file for 'zfs' pkgname=zfs -version=2.1.12 +version=2.2.0 revision=1 build_style=gnu-configure configure_args="--with-config=user --with-mounthelperdir=/usr/bin @@ -10,19 +10,23 @@ hostmakedepends="dracut libtool pkg-config python3 automake" makedepends="pam-devel zlib-devel libuuid-devel libblkid-devel libtirpc-devel attr-devel" depends="dkms>=2.2.0.3_9 perl python3 xbps-triggers>=0.121_1 libzfs>=${version}_${revision}" -conf_files="/etc/zfs/zed.d/zed.rc" +conf_files="/etc/zfs/zed.d/zed.rc /usr/src/zfs/zfs-${version}/META" short_desc="Z File System -- userland, pyzfs, and kernel modules (using DKMS)" 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=64daa26aed3e12c931f6f4413d7527c4ebdb8da35416b356152b5f9fdd4c6e6d +distfiles="https://github.com/openzfs/zfs/releases/download/zfs-${version}-rc3/zfs-${version}-rc3.tar.gz" +checksum=276c911ab4aa24b5c261e1e1822f74ed824a424cacf3f39b14da1aa08ce1906c # dkms must be before initramfs-regenerate to build modules before images triggers="dkms initramfs-regenerate" dkms_modules="zfs ${version}" replaces="spl<=0.7.13_1" # Because SPL was merged into zfs in 0.8.0 +case "$XBPS_MACHINE" in + aarch64*) broken "NEON symbols are GPL only, see https://github.com/void-linux/void-packages/issues/45552" +esac + pre_configure() { export CFLAGS+=" -I${XBPS_CROSS_BASE}/usr/include/tirpc/" autoreconf -fi @@ -55,6 +59,11 @@ post_install() { # Contains ELF binaries. Remove it until upstream has a way to move this # into /usr/libexec or similiar. rm -rf ${DESTDIR}/usr/share/zfs/zfs-tests + + # move bash completions to a policy compliant directory + vmkdir usr/share/bash-completion/completions + mv ${DESTDIR}/etc/bash_completion.d/* \ + ${DESTDIR}/usr/share/bash-completion/completions } libzfs_package() {