From 108d656cda099fb38537a04af168bba94a4ed2d4 Mon Sep 17 00:00:00 2001 From: Jonathon Fernyhough Date: Tue, 25 Jan 2022 18:10:16 +0000 Subject: Upstream fixes for 5.16 --- PKGBUILD | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) (limited to 'PKGBUILD') diff --git a/PKGBUILD b/PKGBUILD index 25423b4..f82ccc7 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,7 +5,7 @@ pkgname=zfs-dkms pkgver=2.1.2 -pkgrel=1 +pkgrel=2 pkgdesc="Kernel modules for the Zettabyte File System." arch=('any') url="https://zfsonlinux.org/" @@ -16,13 +16,25 @@ 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} - "0001-only-build-the-module-in-dkms.conf.patch") + "0001-only-build-the-module-in-dkms.conf.patch" + "0002-check-slabh-for-kvmalloc.patch::https://github.com/openzfs/zfs/commit/e86f88aa0b4f4e2784980d6d5c04f397e4839493.patch" + "0003-added-add_disk-check-for-return.patch::https://github.com/openzfs/zfs/commit/12fa250d84c0a96b95fd0ff70509c43dd8b640a0.patch" + "0004-added-mapping-for-iov_iter_fault_in_readable.patch::https://github.com/openzfs/zfs/commit/299fbf75ecf302e790908d8098a8cd215125a6b5.patch" + "0005-add-support-for-falloc_fl_zero_range.patch::https://github.com/openzfs/zfs/commit/4372e96f4b4b21c8e79c0c961589f61b11859e07.patch") sha256sums=('258cf1d17a1f668a3b99b61eaf14be06c614df42503db0319bef1b9fc4c8b9e7' 'SKIP' - '780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409') + '780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409' + 'd3f406a988d8cb365b1476df9e56e667ae4126c6fd094dd31bd83eea38ff53d8' + '6d5ed172126687fb741e1981aa325b9f147fa9b8c2a4bcdb8ca5a1beb2edc14a' + 'd4aabba2a4accb5fac545a173573d3c857cf148d7484982ccf6f2a71f4de0bc0' + 'abd3a03d109330e408ad08695b7a71453a6c4aa549752248d92e8d03a228c392') b2sums=('ab4e2d85200438373c7eeeaa5256a712dbfb2862b85de1fb7554ad0cc2b9f8e1255ab4564bca62f65a81a823adb8c112957e6e8771b8e5e6944c3731bc894584' 'SKIP' - '1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50') + '1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50' + '164c2f8aaaa06cfe6eb1cad8102b8886543224bb171505990e0b6d2c8a5ca28e7880b05e492b2da42d8bce719e2c9a9dd17ea31b38bf3ad53b46f75d6b12072d' + '6011e4f2e794f955fe509cbf9008e9116e9f3ea1066339aca2aabb2939f1660cc48940b7a847316d39b2d0b3a4c5e1cbfc4a964875559ae937f9d56b959c69ad' + 'c6a8ddbaab468788fff978999e6d15a6710fcbb2bdeba6ed97089cf59d4d53ef86e0dac2dd43352cd116f602ab87adcbfdd02cbd640927a8391340fa2255301f' + 'ec748954dc52c6f318bc4b73aad4b62e1c3aef7b2c587c79dd693596d10299dd80c57d284b9ff11916984092138e329f26d266d9155a49513e21a44b357c52fa') validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) 'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf @@ -31,6 +43,12 @@ prepare() { patch -p1 -i ../0001-only-build-the-module-in-dkms.conf.patch + # "A couple of Linux 5.16 fixes", https://github.com/openzfs/zfs/pull/12975 + patch -p1 -i ../0002-check-slabh-for-kvmalloc.patch + patch -p1 -i ../0003-added-add_disk-check-for-return.patch + patch -p1 -i ../0004-added-mapping-for-iov_iter_fault_in_readable.patch + patch -p1 -i ../0005-add-support-for-falloc_fl_zero_range.patch + # remove unneeded sections from module build sed -ri "/AC_CONFIG_FILES/,/]\)/{ /AC_CONFIG_FILES/n -- cgit v1.2.1 From d649df7ca2008b3a6d5c56f2b78bc57ca5828719 Mon Sep 17 00:00:00 2001 From: Jonathon Fernyhough Date: Fri, 11 Mar 2022 01:36:29 +0000 Subject: Upstream 2.1.3 --- PKGBUILD | 32 +++++++------------------------- 1 file changed, 7 insertions(+), 25 deletions(-) (limited to 'PKGBUILD') diff --git a/PKGBUILD b/PKGBUILD index f82ccc7..db0e2b8 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,8 +4,8 @@ # All my PKGBUILDs are managed at https://github.com/eli-schwartz/pkgbuilds pkgname=zfs-dkms -pkgver=2.1.2 -pkgrel=2 +pkgver=2.1.3 +pkgrel=1 pkgdesc="Kernel modules for the Zettabyte File System." arch=('any') url="https://zfsonlinux.org/" @@ -16,25 +16,13 @@ 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} - "0001-only-build-the-module-in-dkms.conf.patch" - "0002-check-slabh-for-kvmalloc.patch::https://github.com/openzfs/zfs/commit/e86f88aa0b4f4e2784980d6d5c04f397e4839493.patch" - "0003-added-add_disk-check-for-return.patch::https://github.com/openzfs/zfs/commit/12fa250d84c0a96b95fd0ff70509c43dd8b640a0.patch" - "0004-added-mapping-for-iov_iter_fault_in_readable.patch::https://github.com/openzfs/zfs/commit/299fbf75ecf302e790908d8098a8cd215125a6b5.patch" - "0005-add-support-for-falloc_fl_zero_range.patch::https://github.com/openzfs/zfs/commit/4372e96f4b4b21c8e79c0c961589f61b11859e07.patch") -sha256sums=('258cf1d17a1f668a3b99b61eaf14be06c614df42503db0319bef1b9fc4c8b9e7' + "0001-only-build-the-module-in-dkms.conf.patch") +sha256sums=('b61b644547793f409cafd6538a52d78f2f72b0cd013e88340882457c8c9b43fd' 'SKIP' - '780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409' - 'd3f406a988d8cb365b1476df9e56e667ae4126c6fd094dd31bd83eea38ff53d8' - '6d5ed172126687fb741e1981aa325b9f147fa9b8c2a4bcdb8ca5a1beb2edc14a' - 'd4aabba2a4accb5fac545a173573d3c857cf148d7484982ccf6f2a71f4de0bc0' - 'abd3a03d109330e408ad08695b7a71453a6c4aa549752248d92e8d03a228c392') -b2sums=('ab4e2d85200438373c7eeeaa5256a712dbfb2862b85de1fb7554ad0cc2b9f8e1255ab4564bca62f65a81a823adb8c112957e6e8771b8e5e6944c3731bc894584' + 'd964e11018992a2acd98e263244efdbfe4367d26ad15f4728848261d3c6e227a') +b2sums=('b4fc59ae97c74661f1303e4ce6efd5304842d382e278633debc4475c32074b9d272379d5d4caf8155f7a8cb1cb2b871b8c61fc36e14a612220757c5703a4c50b' 'SKIP' - '1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50' - '164c2f8aaaa06cfe6eb1cad8102b8886543224bb171505990e0b6d2c8a5ca28e7880b05e492b2da42d8bce719e2c9a9dd17ea31b38bf3ad53b46f75d6b12072d' - '6011e4f2e794f955fe509cbf9008e9116e9f3ea1066339aca2aabb2939f1660cc48940b7a847316d39b2d0b3a4c5e1cbfc4a964875559ae937f9d56b959c69ad' - 'c6a8ddbaab468788fff978999e6d15a6710fcbb2bdeba6ed97089cf59d4d53ef86e0dac2dd43352cd116f602ab87adcbfdd02cbd640927a8391340fa2255301f' - 'ec748954dc52c6f318bc4b73aad4b62e1c3aef7b2c587c79dd693596d10299dd80c57d284b9ff11916984092138e329f26d266d9155a49513e21a44b357c52fa') + '0e91cd2421b81c8ee517503059fb9ebc20e7c150801851cff2ffdfb64cbcd9a4e0657e7678c412a334fc37b589006ec78dca2ccc091b034a83a00966acba6f5b') validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) 'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf @@ -43,12 +31,6 @@ prepare() { patch -p1 -i ../0001-only-build-the-module-in-dkms.conf.patch - # "A couple of Linux 5.16 fixes", https://github.com/openzfs/zfs/pull/12975 - patch -p1 -i ../0002-check-slabh-for-kvmalloc.patch - patch -p1 -i ../0003-added-add_disk-check-for-return.patch - patch -p1 -i ../0004-added-mapping-for-iov_iter_fault_in_readable.patch - patch -p1 -i ../0005-add-support-for-falloc_fl_zero_range.patch - # remove unneeded sections from module build sed -ri "/AC_CONFIG_FILES/,/]\)/{ /AC_CONFIG_FILES/n -- cgit v1.2.1 From 1dd64f0c7f54c4cda4439b0d2feb9704ec29ff3c Mon Sep 17 00:00:00 2001 From: Jonathon Fernyhough Date: Wed, 23 Mar 2022 22:03:14 +0000 Subject: Upstream 2.1.4 --- PKGBUILD | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'PKGBUILD') diff --git a/PKGBUILD b/PKGBUILD index db0e2b8..009a29a 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # All my PKGBUILDs are managed at https://github.com/eli-schwartz/pkgbuilds pkgname=zfs-dkms -pkgver=2.1.3 +pkgver=2.1.4 pkgrel=1 pkgdesc="Kernel modules for the Zettabyte File System." arch=('any') @@ -17,10 +17,10 @@ provides+=('zfs') replaces=('spl-dkms') source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc} "0001-only-build-the-module-in-dkms.conf.patch") -sha256sums=('b61b644547793f409cafd6538a52d78f2f72b0cd013e88340882457c8c9b43fd' +sha256sums=('3b52c0d493f806f638dca87dde809f53861cd318c1ebb0e60daeaa061cf1acf6' 'SKIP' 'd964e11018992a2acd98e263244efdbfe4367d26ad15f4728848261d3c6e227a') -b2sums=('b4fc59ae97c74661f1303e4ce6efd5304842d382e278633debc4475c32074b9d272379d5d4caf8155f7a8cb1cb2b871b8c61fc36e14a612220757c5703a4c50b' +b2sums=('be303f1181f604770536aa4aa61d5319ec408abbd04964cedadd15b3101a15deba6539bb5d833f4fed357f323d74f622d035305df699b213df41ae45bffdd200' 'SKIP' '0e91cd2421b81c8ee517503059fb9ebc20e7c150801851cff2ffdfb64cbcd9a4e0657e7678c412a334fc37b589006ec78dca2ccc091b034a83a00966acba6f5b') validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) -- cgit v1.2.1