summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Stolp2024-08-06 17:16:42 -0700
committerKevin Stolp2024-08-06 17:16:42 -0700
commitf2e8e1cb5dd8ca945827671bb43831d28782cc16 (patch)
tree331ba610d6d6e07d60b8bff9d41fdb0bc38ce3f3
parentde0ce618784a5d01203847df44dc3c64fd5ee8c1 (diff)
downloadaur-f2e8e1cb5dd8ca945827671bb43831d28782cc16.tar.gz
ZFS 2.2.5 upstream release
-rw-r--r--.SRCINFO21
-rw-r--r--PKGBUILD15
2 files changed, 13 insertions, 23 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5257668f592b..ca05aee033fa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,31 +1,28 @@
pkgbase = zfs-dkms
pkgdesc = Kernel modules for the Zettabyte File System.
- pkgver = 2.2.4
- pkgrel = 3
+ pkgver = 2.2.5
+ pkgrel = 1
url = https://zfsonlinux.org/
arch = any
license = CDDL
- provides = ZFS-MODULE=2.2.4
- provides = SPL-MODULE=2.2.4
+ provides = ZFS-MODULE=2.2.5
+ provides = SPL-MODULE=2.2.5
provides = zfs
- source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.2.4/zfs-2.2.4.tar.gz
- source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.2.4/zfs-2.2.4.tar.gz.asc
+ source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.2.5/zfs-2.2.5.tar.gz
+ source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.2.5/zfs-2.2.5.tar.gz.asc
source = enforce_kernel_max_version.patch::https://github.com/openzfs/zfs/commit/2b481b5477d3a95d0eab723c6639f7114e146ae1.patch?full_index=1
- source = disable_automatic_dependency_tracking.patch::https://github.com/openzfs/zfs/commit/c98295eed2687cee704ef5f8f3218d3d44a6a1d8.patch?full_index=1
source = 0001-only-build-the-module-in-dkms.conf.patch
validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027
validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B
- sha256sums = 9790905f7683d41759418e1ef3432828c31116654ff040e91356ff1c21c31ec0
+ sha256sums = 2388cf6f29cd75e87d6d05e4858a09d419c4f883a658d51ef57796121cd08897
sha256sums = SKIP
sha256sums = c372060ce43be8fd0fd8b2ea2d147e048d51d6c8713433b15a5f29085f90106d
- sha256sums = 9dc7963c3ac59b0d7ea33ca2aed9dd2e80de0cfb1517df9d028e8e0f2944d3dd
sha256sums = 8d5c31f883a906ab42776dcda79b6c89f904d8f356ade0dab5491578a6af55a5
- b2sums = f0026a12b7c1252bf8941e39f23d3e165750034707dfddf034d8aac942a749cb7f0108478797ca978704a22743d9928240b29cf78fe89eda9f873f40102413f0
+ b2sums = ec73c866bf931e4af63a35b3e61e1254d681d21aadba304ea95c147a3911c3d92db686591147036848ceae1683f31f6f81e04a24df6cb11a91a8abaed179567f
b2sums = SKIP
b2sums = dd902faa9d8ddc2ec5eeba3810f719764da05bae2e2af80b72dac619c979625e3e366762bdfab72a97b487128b2f281c833a2c3ebe73c5999c49949e478bcffc
- b2sums = d8d48a1781878289810372e71b080fa99b8cbc0135ce774b603307404efc01172f8a55cdff4f7060d6333a0eb83d8e881b1fddbec8f45896d2affac8057d8c16
b2sums = 58dc2494e71b50833d44c126b72acad52e9817626542afbc245b7ba82009e8c8252ebde6023592aac42d9942207e7655c0a421da9067fbdd619746ebc372d791
pkgname = zfs-dkms
- depends = zfs-utils=2.2.4
+ depends = zfs-utils=2.2.5
depends = dkms
diff --git a/PKGBUILD b/PKGBUILD
index 8ad8fcce62fb..27f60bd48b5d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,8 +3,8 @@
# Contributor: Iacopo Isimbaldi <isiachi@rhye.it>
pkgname=zfs-dkms
-pkgver=2.2.4
-pkgrel=3
+pkgver=2.2.5
+pkgrel=1
pkgdesc="Kernel modules for the Zettabyte File System."
arch=('any')
url="https://zfsonlinux.org/"
@@ -14,17 +14,14 @@ provides=("ZFS-MODULE=${pkgver}" "SPL-MODULE=${pkgver}")
provides+=('zfs')
source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc}
"enforce_kernel_max_version.patch::https://github.com/openzfs/zfs/commit/2b481b5477d3a95d0eab723c6639f7114e146ae1.patch?full_index=1"
- "disable_automatic_dependency_tracking.patch::https://github.com/openzfs/zfs/commit/c98295eed2687cee704ef5f8f3218d3d44a6a1d8.patch?full_index=1"
"0001-only-build-the-module-in-dkms.conf.patch")
-sha256sums=('9790905f7683d41759418e1ef3432828c31116654ff040e91356ff1c21c31ec0'
+sha256sums=('2388cf6f29cd75e87d6d05e4858a09d419c4f883a658d51ef57796121cd08897'
'SKIP'
'c372060ce43be8fd0fd8b2ea2d147e048d51d6c8713433b15a5f29085f90106d'
- '9dc7963c3ac59b0d7ea33ca2aed9dd2e80de0cfb1517df9d028e8e0f2944d3dd'
'8d5c31f883a906ab42776dcda79b6c89f904d8f356ade0dab5491578a6af55a5')
-b2sums=('f0026a12b7c1252bf8941e39f23d3e165750034707dfddf034d8aac942a749cb7f0108478797ca978704a22743d9928240b29cf78fe89eda9f873f40102413f0'
+b2sums=('ec73c866bf931e4af63a35b3e61e1254d681d21aadba304ea95c147a3911c3d92db686591147036848ceae1683f31f6f81e04a24df6cb11a91a8abaed179567f'
'SKIP'
'dd902faa9d8ddc2ec5eeba3810f719764da05bae2e2af80b72dac619c979625e3e366762bdfab72a97b487128b2f281c833a2c3ebe73c5999c49949e478bcffc'
- 'd8d48a1781878289810372e71b080fa99b8cbc0135ce774b603307404efc01172f8a55cdff4f7060d6333a0eb83d8e881b1fddbec8f45896d2affac8057d8c16'
'58dc2494e71b50833d44c126b72acad52e9817626542afbc245b7ba82009e8c8252ebde6023592aac42d9942207e7655c0a421da9067fbdd619746ebc372d791')
validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) <hutter2@llnl.gov>
'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf <behlendorf1@llnl.gov>
@@ -37,10 +34,6 @@ prepare() {
# Apply patch to warn on unsupported kernel version. (https://github.com/openzfs/zfs/pull/15986)
patch -p1 -i ../enforce_kernel_max_version.patch
- # Apply patch to prevent dkms build from leaving unwanted files in `/usr/lib/modules`
- # (https://github.com/openzfs/zfs/pull/16241)
- patch -p1 -i ../disable_automatic_dependency_tracking.patch
-
# remove unneeded sections from module build
sed -ri "/AC_CONFIG_FILES/,/]\)/{
/AC_CONFIG_FILES/n