summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO21
-rw-r--r--PKGBUILD15
2 files changed, 13 insertions, 23 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ebf6d8507243..fe16a30463bb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,28 @@
pkgbase = zfs-dkms
pkgdesc = Kernel modules for the Zettabyte File System.
- pkgver = 2.1.7
- pkgrel = 2
+ pkgver = 2.1.8
+ pkgrel = 1
url = https://zfsonlinux.org/
arch = any
license = CDDL
- provides = ZFS-MODULE=2.1.7
- provides = SPL-MODULE=2.1.7
+ provides = ZFS-MODULE=2.1.8
+ provides = SPL-MODULE=2.1.8
provides = spl-dkms
provides = zfs
conflicts = spl-dkms
replaces = spl-dkms
- source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.7/zfs-2.1.7.tar.gz
- source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.7/zfs-2.1.7.tar.gz.asc
- source = https://github.com/openzfs/zfs/commit/eee9362a72cfd615e40928e86d61747683dc9dc6.patch
+ source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.8/zfs-2.1.8.tar.gz
+ source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.8/zfs-2.1.8.tar.gz.asc
source = 0001-only-build-the-module-in-dkms.conf.patch
validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027
validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B
- sha256sums = 6462e63e185de6ff10c64ffa6ed773201a082f9dd13e603d7e8136fcb4aca71b
+ sha256sums = c81c6cdcc6c1deb24dda02e33389e9242f338ef8892e0c161945db1db8b48937
sha256sums = SKIP
- sha256sums = 36fe8f9aef7ac3501cefc28f7e84cd5de20239a7ed3e8e2864e38af18533dfae
sha256sums = 8d5c31f883a906ab42776dcda79b6c89f904d8f356ade0dab5491578a6af55a5
- b2sums = 9c85c3eb72f3bb39bc4fd44aaa80338ca197a4e8183436fee73cd56705abfdaecfaf1b6fbe8dd508ccce707c8259c7ab6e1733b60b17757f0a7ff92d4e52bbad
+ b2sums = e725a43e5a62998209d638adcec061858f0caf05abd30bcfbaf8c6f6b9f47209808d9fcd726a830ea800793cd719c4471a498a10dab66119c4d24dbf09b1c481
b2sums = SKIP
- b2sums = 7723ad081919bb9ec8f4261f53cf50b6753e60105bbaa1afe3eb8ce30e9a73cd6d05b97cbd4f0b1f9497a7588111f8e1018feb707982b305b5dd7ba4e4fd2d2a
b2sums = 58dc2494e71b50833d44c126b72acad52e9817626542afbc245b7ba82009e8c8252ebde6023592aac42d9942207e7655c0a421da9067fbdd619746ebc372d791
pkgname = zfs-dkms
- depends = zfs-utils=2.1.7
+ depends = zfs-utils=2.1.8
depends = dkms
diff --git a/PKGBUILD b/PKGBUILD
index b596bc461618..98d24ba0fdfe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
# Contributor: Iacopo Isimbaldi <isiachi@rhye.it>
pkgname=zfs-dkms
-pkgver=2.1.7
-pkgrel=2
+pkgver=2.1.8
+pkgrel=1
pkgdesc="Kernel modules for the Zettabyte File System."
arch=('any')
url="https://zfsonlinux.org/"
@@ -15,15 +15,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/eee9362a72cfd615e40928e86d61747683dc9dc6.patch"
"0001-only-build-the-module-in-dkms.conf.patch")
-sha256sums=('6462e63e185de6ff10c64ffa6ed773201a082f9dd13e603d7e8136fcb4aca71b'
+sha256sums=('c81c6cdcc6c1deb24dda02e33389e9242f338ef8892e0c161945db1db8b48937'
'SKIP'
- '36fe8f9aef7ac3501cefc28f7e84cd5de20239a7ed3e8e2864e38af18533dfae'
'8d5c31f883a906ab42776dcda79b6c89f904d8f356ade0dab5491578a6af55a5')
-b2sums=('9c85c3eb72f3bb39bc4fd44aaa80338ca197a4e8183436fee73cd56705abfdaecfaf1b6fbe8dd508ccce707c8259c7ab6e1733b60b17757f0a7ff92d4e52bbad'
+b2sums=('e725a43e5a62998209d638adcec061858f0caf05abd30bcfbaf8c6f6b9f47209808d9fcd726a830ea800793cd719c4471a498a10dab66119c4d24dbf09b1c481'
'SKIP'
- '7723ad081919bb9ec8f4261f53cf50b6753e60105bbaa1afe3eb8ce30e9a73cd6d05b97cbd4f0b1f9497a7588111f8e1018feb707982b305b5dd7ba4e4fd2d2a'
'58dc2494e71b50833d44c126b72acad52e9817626542afbc245b7ba82009e8c8252ebde6023592aac42d9942207e7655c0a421da9067fbdd619746ebc372d791')
validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) <hutter2@llnl.gov>
'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf <behlendorf1@llnl.gov>
@@ -33,10 +30,6 @@ 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