summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
authorKevin Stolp2023-01-16 00:38:29 -0800
committerKevin Stolp2023-01-16 00:38:29 -0800
commitadff772922bad2a27dd86a47570831aadb9f36e3 (patch)
tree6214aacf75f5ff0056a6baae991c182f2ab95d3b /PKGBUILD
parent1697c7e21c461a9753b0c48e4c9f297ff6a2326e (diff)
downloadaur-adff772922bad2a27dd86a47570831aadb9f36e3.tar.gz
Backport fix for issue related to send/receive.
Issue: https://github.com/openzfs/zfs/issues/14252 Pull request: https://github.com/openzfs/zfs/pull/14304
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD9
1 files changed, 8 insertions, 1 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 52c86c1a3239..b596bc461618 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=zfs-dkms
pkgver=2.1.7
-pkgrel=1
+pkgrel=2
pkgdesc="Kernel modules for the Zettabyte File System."
arch=('any')
url="https://zfsonlinux.org/"
@@ -15,12 +15,15 @@ provides=("ZFS-MODULE=${pkgver}" "SPL-MODULE=${pkgver}" 'spl-dkms')
provides+=('zfs')
replaces=('spl-dkms')
source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc}
+ "https://github.com/openzfs/zfs/commit/eee9362a72cfd615e40928e86d61747683dc9dc6.patch"
"0001-only-build-the-module-in-dkms.conf.patch")
sha256sums=('6462e63e185de6ff10c64ffa6ed773201a082f9dd13e603d7e8136fcb4aca71b'
'SKIP'
+ '36fe8f9aef7ac3501cefc28f7e84cd5de20239a7ed3e8e2864e38af18533dfae'
'8d5c31f883a906ab42776dcda79b6c89f904d8f356ade0dab5491578a6af55a5')
b2sums=('9c85c3eb72f3bb39bc4fd44aaa80338ca197a4e8183436fee73cd56705abfdaecfaf1b6fbe8dd508ccce707c8259c7ab6e1733b60b17757f0a7ff92d4e52bbad'
'SKIP'
+ '7723ad081919bb9ec8f4261f53cf50b6753e60105bbaa1afe3eb8ce30e9a73cd6d05b97cbd4f0b1f9497a7588111f8e1018feb707982b305b5dd7ba4e4fd2d2a'
'58dc2494e71b50833d44c126b72acad52e9817626542afbc245b7ba82009e8c8252ebde6023592aac42d9942207e7655c0a421da9067fbdd619746ebc372d791')
validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) <hutter2@llnl.gov>
'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf <behlendorf1@llnl.gov>
@@ -30,6 +33,10 @@ prepare() {
patch -p1 -i ../0001-only-build-the-module-in-dkms.conf.patch
+ # Backport fix for issue related to send/receive. (https://github.com/openzfs/zfs/issues/14252)
+ sed -i -e '77,212d' ../eee9362a72cfd615e40928e86d61747683dc9dc6.patch # Don't patch test files.
+ patch -p1 -i ../eee9362a72cfd615e40928e86d61747683dc9dc6.patch
+
# remove unneeded sections from module build
sed -ri "/AC_CONFIG_FILES/,/]\)/{
/AC_CONFIG_FILES/n