From aa6bf94adf76cd1ee034fc8bc0b4142e569eb202 Mon Sep 17 00:00:00 2001 From: Jonathon Fernyhough Date: Tue, 1 Jun 2021 20:55:50 +0100 Subject: upgpkg: zfs-dkms 2.0.4-3 kernel 5.12 backports This includes a number of backports for the zfs-2.0.5-staging branch and switches compat patches from 12009 to the merged commits. Signed-off-by: Eli Schwartz --- .SRCINFO | 26 +++++++++++++++++++------- PKGBUILD | 40 +++++++++++++++++++++++++++++++--------- 2 files changed, 50 insertions(+), 16 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 2ffb8bd..d594a26 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = zfs-dkms pkgdesc = Kernel modules for the Zettabyte File System. pkgver = 2.0.4 - pkgrel = 2 + pkgrel = 3 url = https://zfsonlinux.org/ arch = any license = CDDL @@ -13,20 +13,32 @@ pkgbase = zfs-dkms replaces = spl-dkms source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.0.4/zfs-2.0.4.tar.gz source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.0.4/zfs-2.0.4.tar.gz.asc - source = https://github.com/openzfs/zfs/pull/12009/commits/938a7a375b2c18fef621fb30d71bec0c19e94142.patch - source = https://github.com/openzfs/zfs/pull/12009/commits/8122746cc52741e2d010aa0ad8e0f15ab24bbf28.patch + source = https://github.com/openzfs/zfs/commit/f315d9a3ff3cc0b81c99dd9be5878a55d2e98d8e.patch + source = https://github.com/openzfs/zfs/commit/77352db228c07ce8ba50478b9029820ca69c6c1b.patch + source = https://github.com/openzfs/zfs/commit/6eced028dbbc2a44e32c4c0a76234ac2da9a365a.patch + source = https://github.com/openzfs/zfs/commit/b3f8b103cb3a4bbb7ad41f6faf630be7baa4f585.patch + source = https://github.com/openzfs/zfs/commit/ee2a9d2c771657168652e058477b81389c662b5e.patch + source = https://github.com/openzfs/zfs/commit/3e0bc63e1b0ca03493b936e92e871ca7ae451a0a.patch source = 0001-only-build-the-module-in-dkms.conf.patch validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027 validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B sha256sums = 7d1344c5433b91823f02c2e40b33d181fa6faf286bea5591f4b1965f23d45f6c sha256sums = SKIP - sha256sums = 6650bcaf8c1ebe23a0f749feeaf316b75148a76549129deba5f65d4555b2b874 - sha256sums = 61595dd8b1e3fa4c7ca61a67a6960135ee11710d80f9fe6bec7071acece84028 + sha256sums = f91835f187f5210fd855ee929b8f893771874a456db2bee685f71c833c696db8 + sha256sums = d44e6e7b6a6aa5dc4422127f23524f315463fb9c042a519817b4f9cba5c483d1 + sha256sums = d07813f7e8427956cd9ae814540bca7a8d4638f1dbdea2fefc9c73bf2f553ba8 + sha256sums = 5940e29e428e74df8ca4ed924259e86cef57226680f27675944d3fdcce9d8604 + sha256sums = 9091d65ec611119778daa167177f6a634a8f4cd9fa4b0e819de32a60ea0137fc + sha256sums = 0b705a23f748b98a5d789d32aedd342ed61378f0b1c65539d8c6df510c587050 sha256sums = 780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409 b2sums = 7e4780092c0a87d5d187cd5734ddc736574db80b500f155287640ef2230e09335cc9b6b26ec1b7d8ab1b7942673ea49a3007a81da372a6d2ac36f3908913045c b2sums = SKIP - b2sums = 195fe600d859ac6832891b5c938b2d55e22cfbbf8da56772e884d436ace9b48c8571015d1440884efc1e531294e8ef95ce45d69a22a93ef62e1016e497856a3f - b2sums = d6e67e037375dc99a3caacec257901c5678b08e42fa2158ce8d8bd0b93d47b9bd69b95042bac7a58bf987c155107fe80c93b57c0cd38e4065dbac24ac409cc54 + b2sums = 49724351c5a8e6ffa66762d5aac84ad89a3d04022d086d9f37ccd616b3e8e95852197b5333bdeeeab54fc51516d8254d0138a4422cc66214bb602e5ed72bbabf + b2sums = cfe0d17448f25ec649ca7cf0bb7ee4f2685d09b2fa693b411f31a4035e113627c8be73514b39f2460646b9a556a133afcbfc803675d93d1fd5d93d64d8b4e7b2 + b2sums = b1012123a6d9ddd03b7db83075447eba99c8fb4e3bf4f4e8a54d9defe2c4e6b752bda70d8512a8da68f509fc832acbaf2eb73c6673123553ac38c99095d7f872 + b2sums = 556d3850a2c7f74370702ad354f64424170682f6499b6a5e1a58c45e20ddb082109a541b8613b815820569aeab5c322e180d8f0d0a6cea4799e11dd9afbe464e + b2sums = 4454568cfcafa9b6b7ba6de94df728da349f1dff9803c21fc4d9613af17b65dc59ba2c7cf9584d1456cf454e4ba1bf9a9467e0b181d097861d649ffd32461bf4 + b2sums = c32c94c233cc15f1db4166d293b7e0030f51c9ba6ba185293a2c068419a64c46288244e6096f69f55e5bd19006729b080cb95966519eb8db142a494d9f147878 b2sums = 1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50 pkgname = zfs-dkms diff --git a/PKGBUILD b/PKGBUILD index eb2ca3d..ec21a2f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,7 +5,7 @@ pkgname=zfs-dkms pkgver=2.0.4 -pkgrel=2 +pkgrel=3 pkgdesc="Kernel modules for the Zettabyte File System." arch=('any') url="https://zfsonlinux.org/" @@ -16,18 +16,30 @@ 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/pull/12009/commits/938a7a375b2c18fef621fb30d71bec0c19e94142.patch" - "https://github.com/openzfs/zfs/pull/12009/commits/8122746cc52741e2d010aa0ad8e0f15ab24bbf28.patch" + "https://github.com/openzfs/zfs/commit/f315d9a3ff3cc0b81c99dd9be5878a55d2e98d8e.patch" + "https://github.com/openzfs/zfs/commit/77352db228c07ce8ba50478b9029820ca69c6c1b.patch" + "https://github.com/openzfs/zfs/commit/6eced028dbbc2a44e32c4c0a76234ac2da9a365a.patch" + "https://github.com/openzfs/zfs/commit/b3f8b103cb3a4bbb7ad41f6faf630be7baa4f585.patch" + "https://github.com/openzfs/zfs/commit/ee2a9d2c771657168652e058477b81389c662b5e.patch" + "https://github.com/openzfs/zfs/commit/3e0bc63e1b0ca03493b936e92e871ca7ae451a0a.patch" "0001-only-build-the-module-in-dkms.conf.patch") sha256sums=('7d1344c5433b91823f02c2e40b33d181fa6faf286bea5591f4b1965f23d45f6c' 'SKIP' - '6650bcaf8c1ebe23a0f749feeaf316b75148a76549129deba5f65d4555b2b874' - '61595dd8b1e3fa4c7ca61a67a6960135ee11710d80f9fe6bec7071acece84028' + 'f91835f187f5210fd855ee929b8f893771874a456db2bee685f71c833c696db8' + 'd44e6e7b6a6aa5dc4422127f23524f315463fb9c042a519817b4f9cba5c483d1' + 'd07813f7e8427956cd9ae814540bca7a8d4638f1dbdea2fefc9c73bf2f553ba8' + '5940e29e428e74df8ca4ed924259e86cef57226680f27675944d3fdcce9d8604' + '9091d65ec611119778daa167177f6a634a8f4cd9fa4b0e819de32a60ea0137fc' + '0b705a23f748b98a5d789d32aedd342ed61378f0b1c65539d8c6df510c587050' '780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409') b2sums=('7e4780092c0a87d5d187cd5734ddc736574db80b500f155287640ef2230e09335cc9b6b26ec1b7d8ab1b7942673ea49a3007a81da372a6d2ac36f3908913045c' 'SKIP' - '195fe600d859ac6832891b5c938b2d55e22cfbbf8da56772e884d436ace9b48c8571015d1440884efc1e531294e8ef95ce45d69a22a93ef62e1016e497856a3f' - 'd6e67e037375dc99a3caacec257901c5678b08e42fa2158ce8d8bd0b93d47b9bd69b95042bac7a58bf987c155107fe80c93b57c0cd38e4065dbac24ac409cc54' + '49724351c5a8e6ffa66762d5aac84ad89a3d04022d086d9f37ccd616b3e8e95852197b5333bdeeeab54fc51516d8254d0138a4422cc66214bb602e5ed72bbabf' + 'cfe0d17448f25ec649ca7cf0bb7ee4f2685d09b2fa693b411f31a4035e113627c8be73514b39f2460646b9a556a133afcbfc803675d93d1fd5d93d64d8b4e7b2' + 'b1012123a6d9ddd03b7db83075447eba99c8fb4e3bf4f4e8a54d9defe2c4e6b752bda70d8512a8da68f509fc832acbaf2eb73c6673123553ac38c99095d7f872' + '556d3850a2c7f74370702ad354f64424170682f6499b6a5e1a58c45e20ddb082109a541b8613b815820569aeab5c322e180d8f0d0a6cea4799e11dd9afbe464e' + '4454568cfcafa9b6b7ba6de94df728da349f1dff9803c21fc4d9613af17b65dc59ba2c7cf9584d1456cf454e4ba1bf9a9467e0b181d097861d649ffd32461bf4' + 'c32c94c233cc15f1db4166d293b7e0030f51c9ba6ba185293a2c068419a64c46288244e6096f69f55e5bd19006729b080cb95966519eb8db142a494d9f147878' '1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50') validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) 'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf @@ -38,8 +50,18 @@ prepare() { patch -p1 -i ../0001-only-build-the-module-in-dkms.conf.patch # Kernel 5.12 compat, https://github.com/openzfs/zfs/pull/12009 - patch -p1 -i ../938a7a375b2c18fef621fb30d71bec0c19e94142.patch - patch -p1 -i ../8122746cc52741e2d010aa0ad8e0f15ab24bbf28.patch + patch -p1 -i ../f315d9a3ff3cc0b81c99dd9be5878a55d2e98d8e.patch + patch -p1 -i ../77352db228c07ce8ba50478b9029820ca69c6c1b.patch + + # Kernel 5.12 backport "fixes for tmpiles and userns changes", https://github.com/openzfs/zfs/pull/12139 + patch -p1 -i ../6eced028dbbc2a44e32c4c0a76234ac2da9a365a.patch + patch -p1 -i ../b3f8b103cb3a4bbb7ad41f6faf630be7baa4f585.patch + + # Kernel 5.12 backport "Fix dmu_recv_stream test for resumable", https://github.com/openzfs/zfs/pull/12141 + patch -p1 -i ../ee2a9d2c771657168652e058477b81389c662b5e.patch + + # Bugfix backport, "Remove iov_iter_advance() for iter_write", https://github.com/openzfs/zfs/pull/12178 + patch -p1 -i ../3e0bc63e1b0ca03493b936e92e871ca7ae451a0a.patch # remove unneeded sections from module build sed -ri "/AC_CONFIG_FILES/,/]\)/{ -- cgit v1.2.1