summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz@archlinux.org>2019-09-26 21:02:14 -0400
committerEli Schwartz <eschwartz@archlinux.org>2019-09-26 21:02:14 -0400
commit7f5d323591e77f8b6cad5c7f732e9c65c04c519d (patch)
tree87b7ec0fe3b1ed4f10b5b9d9e246e6c1c752baf3
parentzfs-dkms: update patch links and checksums (diff)
downloadzfs-dkms-7f5d323591e77f8b6cad5c7f732e9c65c04c519d.tar.xz
upgpkg: zfs-dkms 0.8.2-1
upstream release remove old makedepends on git -- we don't use it anymore drop backported patches which are in the current release
-rw-r--r--.SRCINFO24
-rw-r--r--PKGBUILD24
2 files changed, 11 insertions, 37 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b2fdfda..ff25c97 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,37 +1,27 @@
pkgbase = zfs-dkms
pkgdesc = Kernel modules for the Zettabyte File System.
- pkgver = 0.8.1
- pkgrel = 2
+ pkgver = 0.8.2
+ pkgrel = 1
url = https://zfsonlinux.org/
arch = any
license = CDDL
- makedepends = git
provides = zfs
provides = spl-dkms
conflicts = spl-dkms
replaces = spl-dkms
- source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.1/zfs-0.8.1.tar.gz
- source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.1/zfs-0.8.1.tar.gz.asc
- source = https://github.com/zfsonlinux/zfs/commit/041205afee7e151a0ac10c9b5314186cf65417dc.patch
- source = https://github.com/zfsonlinux/zfs/commit/e7a99dab2b065ac2f8736a65d1b226d21754d771.patch
- source = 0001-Linux-5.3-compat-Makefile-subdir-m-no-longer-support.patch
+ source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.2/zfs-0.8.2.tar.gz
+ source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.2/zfs-0.8.2.tar.gz.asc
source = 0001-only-build-the-module-in-dkms.conf.patch
validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027
validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B
- sha256sums = 0af79fde44b7b8ecb94d5166ce2e4fff7409c20ed874c2d759db92909e6c2799
+ sha256sums = 47608e257c8ecebb918014ef1da6172c3a45d990885891af18e80f5cc28beab8
sha256sums = SKIP
- sha256sums = 38bc398be920b62f63275268068e326dbee50bc26363c8e136fa0e1aee3a69b5
- sha256sums = dba82a102bbbc7ab32af4f90a863d7566f8844f8571975bf30817f9a9cacd3e3
- sha256sums = 37b84048ebb0c64c6e8a2186dbb0789978890bf816d6f454cb99b51d5ecf9590
sha256sums = 780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409
- b2sums = f18268656381c20af6bd18421636a1c56633c7eafaf91b1308d15508d5f4bdcfa5dfbb4e09d0302ac3de9d6a4f69718fe9c3d083ed5b3ab2a32c6fb7a1db624b
+ b2sums = 5c15f6664ca70f0deeb5b9e32f2bcff68f9821529e5203ff18612ce88473fee9af369354c442f3db7882d301cf17c805c9635b05bfd3460833ed8e5ff8004dd0
b2sums = SKIP
- b2sums = 352fdf46212afcc6fb376251442398011cc1a511efb36d0af730078559cee4d120a955f81f4878aa977bed85ef5d7599272b0433640f8a3d9bea8c6d57191479
- b2sums = 2af677303b5af602cc65c1b732b63493e15e8d314f08c419a81d8fe3aedaeb7cf3bfb918196d4b9cfc6f86c2bcd2f11c242ee36cb0d9f4a57466e81cd3848bf9
- b2sums = 17011f106c74196fa2d430b329223f955a4bcb14a37f1ac44636f71095d3123ecf97d9f0340b3bb6850b3baafc5a1744b8ec2fd46348045c58e2d55a3dab68ce
b2sums = 1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50
pkgname = zfs-dkms
- depends = zfs-utils=0.8.1
+ depends = zfs-utils=0.8.2
depends = dkms
diff --git a/PKGBUILD b/PKGBUILD
index 6062389..c6f110e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,32 +2,22 @@
# Contributor: Iacopo Isimbaldi <isiachi@rhye.it>
pkgname=zfs-dkms
-pkgver=0.8.1
-pkgrel=2
+pkgver=0.8.2
+pkgrel=1
pkgdesc="Kernel modules for the Zettabyte File System."
arch=('any')
url="https://zfsonlinux.org/"
license=('CDDL')
-makedepends=('git')
conflicts=('spl-dkms')
provides=("${pkgname%-dkms}" 'spl-dkms')
replaces=('spl-dkms')
source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc}
- "https://github.com/zfsonlinux/zfs/commit/041205afee7e151a0ac10c9b5314186cf65417dc.patch"
- "https://github.com/zfsonlinux/zfs/commit/e7a99dab2b065ac2f8736a65d1b226d21754d771.patch"
- "0001-Linux-5.3-compat-Makefile-subdir-m-no-longer-support.patch"
"0001-only-build-the-module-in-dkms.conf.patch")
-sha256sums=('0af79fde44b7b8ecb94d5166ce2e4fff7409c20ed874c2d759db92909e6c2799'
+sha256sums=('47608e257c8ecebb918014ef1da6172c3a45d990885891af18e80f5cc28beab8'
'SKIP'
- '38bc398be920b62f63275268068e326dbee50bc26363c8e136fa0e1aee3a69b5'
- 'dba82a102bbbc7ab32af4f90a863d7566f8844f8571975bf30817f9a9cacd3e3'
- '37b84048ebb0c64c6e8a2186dbb0789978890bf816d6f454cb99b51d5ecf9590'
'780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409')
-b2sums=('f18268656381c20af6bd18421636a1c56633c7eafaf91b1308d15508d5f4bdcfa5dfbb4e09d0302ac3de9d6a4f69718fe9c3d083ed5b3ab2a32c6fb7a1db624b'
+b2sums=('5c15f6664ca70f0deeb5b9e32f2bcff68f9821529e5203ff18612ce88473fee9af369354c442f3db7882d301cf17c805c9635b05bfd3460833ed8e5ff8004dd0'
'SKIP'
- '352fdf46212afcc6fb376251442398011cc1a511efb36d0af730078559cee4d120a955f81f4878aa977bed85ef5d7599272b0433640f8a3d9bea8c6d57191479'
- '2af677303b5af602cc65c1b732b63493e15e8d314f08c419a81d8fe3aedaeb7cf3bfb918196d4b9cfc6f86c2bcd2f11c242ee36cb0d9f4a57466e81cd3848bf9'
- '17011f106c74196fa2d430b329223f955a4bcb14a37f1ac44636f71095d3123ecf97d9f0340b3bb6850b3baafc5a1744b8ec2fd46348045c58e2d55a3dab68ce'
'1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50')
validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) <hutter2@llnl.gov>
'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf <behlendorf1@llnl.gov>
@@ -37,12 +27,6 @@ prepare() {
patch -p1 -i ../0001-only-build-the-module-in-dkms.conf.patch
- # backport fixes for building on linux 5.3
- # https://github.com/zfsonlinux/zfs/issues/9332
- patch -p1 -i ../041205afee7e151a0ac10c9b5314186cf65417dc.patch
- patch -p1 -i ../e7a99dab2b065ac2f8736a65d1b226d21754d771.patch
- patch -p1 -i ../0001-Linux-5.3-compat-Makefile-subdir-m-no-longer-support.patch
-
# remove unneeded sections from module build
sed -ri "/AC_CONFIG_FILES/,/]\)/{
/AC_CONFIG_FILES/n