summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathon Fernyhough <jonathon@m2x.dev>2020-10-10 11:58:40 +0100
committerEli Schwartz <eschwartz@archlinux.org>2020-10-13 23:39:36 -0400
commit2c461b9a373a4768e6ce59c057c2be1b492b6405 (patch)
tree244d5cd3764923e92b4df68190865daee49c8b45
parentupgpkg: zfs-dkms 0.8.4-2 (diff)
downloadzfs-dkms-2c461b9a373a4768e6ce59c057c2be1b492b6405.tar.xz
upgpkg: zfs-dkms 0.8.5-1
upstream release
-rw-r--r--.SRCINFO21
-rw-r--r--PKGBUILD14
2 files changed, 13 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6dbe266..04dc6c0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,28 @@
pkgbase = zfs-dkms
pkgdesc = Kernel modules for the Zettabyte File System.
- pkgver = 0.8.4
- pkgrel = 2
+ pkgver = 0.8.5
+ pkgrel = 1
url = https://zfsonlinux.org/
arch = any
license = CDDL
- provides = ZFS-MODULE=0.8.4
- provides = SPL-MODULE=0.8.4
+ provides = ZFS-MODULE=0.8.5
+ provides = SPL-MODULE=0.8.5
provides = spl-dkms
provides = zfs
conflicts = spl-dkms
replaces = spl-dkms
- source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.4/zfs-0.8.4.tar.gz
- source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.4/zfs-0.8.4.tar.gz.asc
- source = https://github.com/openzfs/zfs/commit/d90015c5439167456d02585c25147742453d9aa6.patch
+ source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.5/zfs-0.8.5.tar.gz
+ source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.5/zfs-0.8.5.tar.gz.asc
source = 0001-only-build-the-module-in-dkms.conf.patch
validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027
validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B
- sha256sums = 2b988f5777976f09d08083f6bebf6e67219c4c4c183c1f33033fb7e5e5eacafb
+ sha256sums = dbb41d6b9c606a34ac93f4c19069fd6806ceeacb558f834f8a70755dadb7cd3d
sha256sums = SKIP
- sha256sums = e801bb4e820924b69289785976b280084b5b7d3bb2e9f9cc1a08710d6e5d898b
sha256sums = 780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409
- b2sums = 776bcd6dfab8825c07d315085e288b29bf543d6957325d5d566b7b78c04505dde9bd25eb6684cb4a1b6a657de8a4e1290d04d2b9079d26d6b834a70f1ec3b569
+ b2sums = 8376f360369c4657ff1fc040fb2bba780bbd5d6a98d149d2fa4ba39478588e213dbf6db218c7bd970839f015a69ae00ac951b90afc1c26b34aadf666b2976cab
b2sums = SKIP
- b2sums = 5375c5344ea88f6d2b1a4f9cf9c1efeae67a53ef487fe3962790f32d9dcff2622dd22f8f8b0f83b648fe1f490bd2e12e91f5d5fbfca274e1ec72aaa8f6c5e335
b2sums = 1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50
pkgname = zfs-dkms
- depends = zfs-utils=0.8.4
+ depends = zfs-utils=0.8.5
depends = dkms
diff --git a/PKGBUILD b/PKGBUILD
index 4254167..86142c1 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=0.8.4
-pkgrel=2
+pkgver=0.8.5
+pkgrel=1
pkgdesc="Kernel modules for the Zettabyte File System."
arch=('any')
url="https://zfsonlinux.org/"
@@ -16,15 +16,12 @@ 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/d90015c5439167456d02585c25147742453d9aa6.patch"
"0001-only-build-the-module-in-dkms.conf.patch")
-sha256sums=('2b988f5777976f09d08083f6bebf6e67219c4c4c183c1f33033fb7e5e5eacafb'
+sha256sums=('dbb41d6b9c606a34ac93f4c19069fd6806ceeacb558f834f8a70755dadb7cd3d'
'SKIP'
- 'e801bb4e820924b69289785976b280084b5b7d3bb2e9f9cc1a08710d6e5d898b'
'780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409')
-b2sums=('776bcd6dfab8825c07d315085e288b29bf543d6957325d5d566b7b78c04505dde9bd25eb6684cb4a1b6a657de8a4e1290d04d2b9079d26d6b834a70f1ec3b569'
+b2sums=('8376f360369c4657ff1fc040fb2bba780bbd5d6a98d149d2fa4ba39478588e213dbf6db218c7bd970839f015a69ae00ac951b90afc1c26b34aadf666b2976cab'
'SKIP'
- '5375c5344ea88f6d2b1a4f9cf9c1efeae67a53ef487fe3962790f32d9dcff2622dd22f8f8b0f83b648fe1f490bd2e12e91f5d5fbfca274e1ec72aaa8f6c5e335'
'1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50')
validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) <hutter2@llnl.gov>
'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf <behlendorf1@llnl.gov>
@@ -32,9 +29,6 @@ validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key
prepare() {
cd "${srcdir}"/${pkgname%-dkms}-${pkgver}
- # kernel 5.8 backport from https://github.com/openzfs/zfs/pull/10728
- patch -p1 -i ../d90015c5439167456d02585c25147742453d9aa6.patch
-
patch -p1 -i ../0001-only-build-the-module-in-dkms.conf.patch
# remove unneeded sections from module build