Skip to content

Commit adff772

Browse files
committed
Backport fix for issue related to send/receive.
Issue: openzfs/zfs#14252 Pull request: openzfs/zfs#14304
1 parent 1697c7e commit adff772

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

.SRCINFO

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
pkgbase = zfs-dkms
22
pkgdesc = Kernel modules for the Zettabyte File System.
33
pkgver = 2.1.7
4-
pkgrel = 1
4+
pkgrel = 2
55
url = https://zfsonlinux.org/
66
arch = any
77
license = CDDL
@@ -13,14 +13,17 @@ pkgbase = zfs-dkms
1313
replaces = spl-dkms
1414
source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.7/zfs-2.1.7.tar.gz
1515
source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.7/zfs-2.1.7.tar.gz.asc
16+
source = https://github.com/openzfs/zfs/commit/eee9362a72cfd615e40928e86d61747683dc9dc6.patch
1617
source = 0001-only-build-the-module-in-dkms.conf.patch
1718
validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027
1819
validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B
1920
sha256sums = 6462e63e185de6ff10c64ffa6ed773201a082f9dd13e603d7e8136fcb4aca71b
2021
sha256sums = SKIP
22+
sha256sums = 36fe8f9aef7ac3501cefc28f7e84cd5de20239a7ed3e8e2864e38af18533dfae
2123
sha256sums = 8d5c31f883a906ab42776dcda79b6c89f904d8f356ade0dab5491578a6af55a5
2224
b2sums = 9c85c3eb72f3bb39bc4fd44aaa80338ca197a4e8183436fee73cd56705abfdaecfaf1b6fbe8dd508ccce707c8259c7ab6e1733b60b17757f0a7ff92d4e52bbad
2325
b2sums = SKIP
26+
b2sums = 7723ad081919bb9ec8f4261f53cf50b6753e60105bbaa1afe3eb8ce30e9a73cd6d05b97cbd4f0b1f9497a7588111f8e1018feb707982b305b5dd7ba4e4fd2d2a
2427
b2sums = 58dc2494e71b50833d44c126b72acad52e9817626542afbc245b7ba82009e8c8252ebde6023592aac42d9942207e7655c0a421da9067fbdd619746ebc372d791
2528

2629
pkgname = zfs-dkms

PKGBUILD

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
pkgname=zfs-dkms
66
pkgver=2.1.7
7-
pkgrel=1
7+
pkgrel=2
88
pkgdesc="Kernel modules for the Zettabyte File System."
99
arch=('any')
1010
url="https://zfsonlinux.org/"
@@ -15,12 +15,15 @@ provides=("ZFS-MODULE=${pkgver}" "SPL-MODULE=${pkgver}" 'spl-dkms')
1515
provides+=('zfs')
1616
replaces=('spl-dkms')
1717
source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc}
18+
"https://github.com/openzfs/zfs/commit/eee9362a72cfd615e40928e86d61747683dc9dc6.patch"
1819
"0001-only-build-the-module-in-dkms.conf.patch")
1920
sha256sums=('6462e63e185de6ff10c64ffa6ed773201a082f9dd13e603d7e8136fcb4aca71b'
2021
'SKIP'
22+
'36fe8f9aef7ac3501cefc28f7e84cd5de20239a7ed3e8e2864e38af18533dfae'
2123
'8d5c31f883a906ab42776dcda79b6c89f904d8f356ade0dab5491578a6af55a5')
2224
b2sums=('9c85c3eb72f3bb39bc4fd44aaa80338ca197a4e8183436fee73cd56705abfdaecfaf1b6fbe8dd508ccce707c8259c7ab6e1733b60b17757f0a7ff92d4e52bbad'
2325
'SKIP'
26+
'7723ad081919bb9ec8f4261f53cf50b6753e60105bbaa1afe3eb8ce30e9a73cd6d05b97cbd4f0b1f9497a7588111f8e1018feb707982b305b5dd7ba4e4fd2d2a'
2427
'58dc2494e71b50833d44c126b72acad52e9817626542afbc245b7ba82009e8c8252ebde6023592aac42d9942207e7655c0a421da9067fbdd619746ebc372d791')
2528
validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) <[email protected]>
2629
'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf <[email protected]>
@@ -30,6 +33,10 @@ prepare() {
3033

3134
patch -p1 -i ../0001-only-build-the-module-in-dkms.conf.patch
3235

36+
# Backport fix for issue related to send/receive. (https://github.com/openzfs/zfs/issues/14252)
37+
sed -i -e '77,212d' ../eee9362a72cfd615e40928e86d61747683dc9dc6.patch # Don't patch test files.
38+
patch -p1 -i ../eee9362a72cfd615e40928e86d61747683dc9dc6.patch
39+
3340
# remove unneeded sections from module build
3441
sed -ri "/AC_CONFIG_FILES/,/]\)/{
3542
/AC_CONFIG_FILES/n

0 commit comments

Comments
 (0)