diff options
author | Kevin Stolp | 2023-11-28 13:13:30 -0800 |
---|---|---|
committer | Kevin Stolp | 2023-11-28 13:13:30 -0800 |
commit | b52c57c253a03680da92203b0ab3f3bc0a8be64b (patch) | |
tree | cc136a81f43829e0531d74efbd8eaca54fc2a573 | |
parent | 2e159f7fb405966876702141ae5ae170dd48dedc (diff) | |
download | aur-b52c57c253a03680da92203b0ab3f3bc0a8be64b.tar.gz |
Backport fix for issue related to file corruption
Issue: https://github.com/openzfs/zfs/issues/15526
Pull request: https://github.com/openzfs/zfs/pull/15571
-rw-r--r-- | .SRCINFO | 5 | ||||
-rw-r--r-- | PKGBUILD | 8 |
2 files changed, 11 insertions, 2 deletions
@@ -1,7 +1,7 @@ pkgbase = zfs-dkms pkgdesc = Kernel modules for the Zettabyte File System. pkgver = 2.2.1 - pkgrel = 1 + pkgrel = 2 url = https://zfsonlinux.org/ arch = any license = CDDL @@ -10,14 +10,17 @@ pkgbase = zfs-dkms provides = zfs source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.2.1/zfs-2.2.1.tar.gz source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.2.1/zfs-2.2.1.tar.gz.asc + source = https://github.com/openzfs/zfs/commit/30d581121bb122c90959658e7b28b1672d342897.patch source = 0001-only-build-the-module-in-dkms.conf.patch validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027 validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B sha256sums = 4ff2de43d39710283ae8ff1744aa96e6cdc83c8efe86a715294d4f6bc34a8e8e sha256sums = SKIP + sha256sums = 0a066b4c5f2bbe87dd02c19b4fb3bd51c7a237ed5ea23c5090e5915a1af3b10c sha256sums = 8d5c31f883a906ab42776dcda79b6c89f904d8f356ade0dab5491578a6af55a5 b2sums = c3ff95c892024a11ee5c266b10e3354074606665a201fbab16e1ed12550340e0d991d98bd74f794331b68bd16cd6147a9e8937b8cda72d454abce72a22bafec6 b2sums = SKIP + b2sums = 26d1aebb0293cf2ab555c119bea7d991e0ff80c4d72f7707d2c4dad945d67d6f489324b914fa884f1f2d16cba6db63a85d85257da3400d7469cb4a12c88759d0 b2sums = 58dc2494e71b50833d44c126b72acad52e9817626542afbc245b7ba82009e8c8252ebde6023592aac42d9942207e7655c0a421da9067fbdd619746ebc372d791 pkgname = zfs-dkms @@ -4,7 +4,7 @@ pkgname=zfs-dkms pkgver=2.2.1 -pkgrel=1 +pkgrel=2 pkgdesc="Kernel modules for the Zettabyte File System." arch=('any') url="https://zfsonlinux.org/" @@ -13,12 +13,15 @@ provides=("ZFS-MODULE=${pkgver}" "SPL-MODULE=${pkgver}") # ambiguous, provided for backwards compat, pls don't use provides+=('zfs') source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc} + "https://github.com/openzfs/zfs/commit/30d581121bb122c90959658e7b28b1672d342897.patch" "0001-only-build-the-module-in-dkms.conf.patch") sha256sums=('4ff2de43d39710283ae8ff1744aa96e6cdc83c8efe86a715294d4f6bc34a8e8e' 'SKIP' + '0a066b4c5f2bbe87dd02c19b4fb3bd51c7a237ed5ea23c5090e5915a1af3b10c' '8d5c31f883a906ab42776dcda79b6c89f904d8f356ade0dab5491578a6af55a5') b2sums=('c3ff95c892024a11ee5c266b10e3354074606665a201fbab16e1ed12550340e0d991d98bd74f794331b68bd16cd6147a9e8937b8cda72d454abce72a22bafec6' 'SKIP' + '26d1aebb0293cf2ab555c119bea7d991e0ff80c4d72f7707d2c4dad945d67d6f489324b914fa884f1f2d16cba6db63a85d85257da3400d7469cb4a12c88759d0' '58dc2494e71b50833d44c126b72acad52e9817626542afbc245b7ba82009e8c8252ebde6023592aac42d9942207e7655c0a421da9067fbdd619746ebc372d791') validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) <hutter2@llnl.gov> 'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf <behlendorf1@llnl.gov> @@ -28,6 +31,9 @@ prepare() { patch -p1 -i ../0001-only-build-the-module-in-dkms.conf.patch + # Backport fix for issue related to file corruption. (https://github.com/openzfs/zfs/issues/15526) + patch -p1 -i ../30d581121bb122c90959658e7b28b1672d342897.patch + # remove unneeded sections from module build sed -ri "/AC_CONFIG_FILES/,/]\)/{ /AC_CONFIG_FILES/n |