diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2020-05-21 10:54:55 -0400 |
|---|---|---|
| committer | Eli Schwartz <eschwartz@archlinux.org> | 2020-05-21 10:54:55 -0400 |
| commit | 8b1c76da7d2ef002327a5787b189c0f7d6f37be7 (patch) | |
| tree | 2bd0c690919a8c05be8d9a74805711cc99564859 | |
| parent | zfs-dkms: also update the .SRCINFO which did not happen due to cherry-picking (diff) | |
| download | zfs-dkms-8b1c76da7d2ef002327a5787b189c0f7d6f37be7.tar.xz | |
upgpkg: zfs-dkms 0.8.4-1
upstream release
| -rw-r--r-- | .SRCINFO | 24 | ||||
| -rw-r--r-- | PKGBUILD | 20 |
2 files changed, 13 insertions, 31 deletions
@@ -1,35 +1,29 @@ pkgbase = zfs-dkms pkgdesc = Kernel modules for the Zettabyte File System. - pkgver = 0.8.3 - pkgrel = 3 + pkgver = 0.8.4 + pkgrel = 1 url = https://zfsonlinux.org/ arch = any license = CDDL - provides = ZFS-MODULE=0.8.3 - provides = SPL-MODULE=0.8.3 + provides = ZFS-MODULE=0.8.4 + provides = SPL-MODULE=0.8.4 provides = spl-dkms provides = zfs conflicts = spl-dkms replaces = spl-dkms - source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.3/zfs-0.8.3.tar.gz - source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.3/zfs-0.8.3.tar.gz.asc - source = https://github.com/openzfs/zfs/commit/2fcab8795c7c493845bfa277d44bc443802000b8.patch - source = 0002-fix-5.6-build.patch + 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 = 0001-only-build-the-module-in-dkms.conf.patch validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027 validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B - sha256sums = 545a4897ce30c2d2dd9010a0fdb600a0d3d45805e2387093c473efc03aa9d7fd + sha256sums = 2b988f5777976f09d08083f6bebf6e67219c4c4c183c1f33033fb7e5e5eacafb sha256sums = SKIP - sha256sums = daae58460243c45c2c7505b1d88dcb299ea7d92bcf3f41d2d30bc213000bb1da - sha256sums = 6b9e9ef7b4ddd0a34acc5622c7b0c408f2251ddfc3805f27a6b2b27b984ad430 sha256sums = 780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409 - b2sums = 8b51b9d5b61543566bc7839d8452fdf9358442155e95f93a011531338824bbd4fc8879500e276b02d5d49d504a046728ecc0c6154f69eb7b47180b9bb0e46958 + b2sums = 776bcd6dfab8825c07d315085e288b29bf543d6957325d5d566b7b78c04505dde9bd25eb6684cb4a1b6a657de8a4e1290d04d2b9079d26d6b834a70f1ec3b569 b2sums = SKIP - b2sums = d221881cd4c1edc0af010343b34c941ec8bf11bf34378eef09bb5152d442f0552a527f46105ace2af76dd4b2ff4ad93d6f39fd1be3f42ccda837d0208d7f4365 - b2sums = 2115059a70a8431769d2f556c300380099c6b9e42eaa939319a0afacdf44f45e6a6bb53333378c708fb4fc2c79b4a9d37bfb6a0bce776f9963accd9fdaf9be81 b2sums = 1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50 pkgname = zfs-dkms - depends = zfs-utils=0.8.3 + depends = zfs-utils=0.8.4 depends = dkms @@ -4,8 +4,8 @@ # All my PKGBUILDs are managed at https://github.com/eli-schwartz/pkgbuilds pkgname=zfs-dkms -pkgver=0.8.3 -pkgrel=3 +pkgver=0.8.4 +pkgrel=1 pkgdesc="Kernel modules for the Zettabyte File System." arch=('any') url="https://zfsonlinux.org/" @@ -16,18 +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/2fcab8795c7c493845bfa277d44bc443802000b8.patch" - "0002-fix-5.6-build.patch" "0001-only-build-the-module-in-dkms.conf.patch") -sha256sums=('545a4897ce30c2d2dd9010a0fdb600a0d3d45805e2387093c473efc03aa9d7fd' +sha256sums=('2b988f5777976f09d08083f6bebf6e67219c4c4c183c1f33033fb7e5e5eacafb' 'SKIP' - 'daae58460243c45c2c7505b1d88dcb299ea7d92bcf3f41d2d30bc213000bb1da' - '6b9e9ef7b4ddd0a34acc5622c7b0c408f2251ddfc3805f27a6b2b27b984ad430' '780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409') -b2sums=('8b51b9d5b61543566bc7839d8452fdf9358442155e95f93a011531338824bbd4fc8879500e276b02d5d49d504a046728ecc0c6154f69eb7b47180b9bb0e46958' +b2sums=('776bcd6dfab8825c07d315085e288b29bf543d6957325d5d566b7b78c04505dde9bd25eb6684cb4a1b6a657de8a4e1290d04d2b9079d26d6b834a70f1ec3b569' 'SKIP' - 'd221881cd4c1edc0af010343b34c941ec8bf11bf34378eef09bb5152d442f0552a527f46105ace2af76dd4b2ff4ad93d6f39fd1be3f42ccda837d0208d7f4365' - '2115059a70a8431769d2f556c300380099c6b9e42eaa939319a0afacdf44f45e6a6bb53333378c708fb4fc2c79b4a9d37bfb6a0bce776f9963accd9fdaf9be81' '1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50') validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) <hutter2@llnl.gov> 'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf <behlendorf1@llnl.gov> @@ -35,12 +29,6 @@ validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key prepare() { cd "${srcdir}"/${pkgname%-dkms}-${pkgver} - # fix compilation on kernel 5.5 https://github.com/openzfs/zfs/issues/9745 - patch -p1 -i ../2fcab8795c7c493845bfa277d44bc443802000b8.patch - - # fix compilation on kernel 5.6 https://github.com/openzfs/zfs/pull/9961#issuecomment-591076133 - patch -p1 -i ../0002-fix-5.6-build.patch - patch -p1 -i ../0001-only-build-the-module-in-dkms.conf.patch # remove unneeded sections from module build |