From 52243abf83290f22b5ff2c35693e0b0a8ff79132 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Fri, 27 Sep 2019 11:12:10 -0400 Subject: add github metadata to merged PKGBUILD subtrees --- PKGBUILD | 2 ++ 1 file changed, 2 insertions(+) diff --git a/PKGBUILD b/PKGBUILD index c6f110e..b15863d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,8 @@ # Maintainer: Eli Schwartz # Contributor: Iacopo Isimbaldi +# All my PKGBUILDs are managed at https://github.com/eli-schwartz/pkgbuilds + pkgname=zfs-dkms pkgver=0.8.2 pkgrel=1 -- cgit v1.2.1 From 97c13c081a4ec3edb484b74b6b0edd3f936d1eec Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Mon, 27 Jan 2020 14:52:28 -0500 Subject: upgpkg: zfs-dkms 0.8.3-1 upstream release --- .SRCINFO | 12 ++++++------ PKGBUILD | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index ff25c97..93f2caa 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,6 +1,6 @@ pkgbase = zfs-dkms pkgdesc = Kernel modules for the Zettabyte File System. - pkgver = 0.8.2 + pkgver = 0.8.3 pkgrel = 1 url = https://zfsonlinux.org/ arch = any @@ -9,19 +9,19 @@ pkgbase = zfs-dkms provides = spl-dkms conflicts = spl-dkms replaces = spl-dkms - 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 = 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 = 0001-only-build-the-module-in-dkms.conf.patch validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027 validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B - sha256sums = 47608e257c8ecebb918014ef1da6172c3a45d990885891af18e80f5cc28beab8 + sha256sums = 545a4897ce30c2d2dd9010a0fdb600a0d3d45805e2387093c473efc03aa9d7fd sha256sums = SKIP sha256sums = 780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409 - b2sums = 5c15f6664ca70f0deeb5b9e32f2bcff68f9821529e5203ff18612ce88473fee9af369354c442f3db7882d301cf17c805c9635b05bfd3460833ed8e5ff8004dd0 + b2sums = 8b51b9d5b61543566bc7839d8452fdf9358442155e95f93a011531338824bbd4fc8879500e276b02d5d49d504a046728ecc0c6154f69eb7b47180b9bb0e46958 b2sums = SKIP b2sums = 1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50 pkgname = zfs-dkms - depends = zfs-utils=0.8.2 + depends = zfs-utils=0.8.3 depends = dkms diff --git a/PKGBUILD b/PKGBUILD index c6f110e..a4d2880 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -2,7 +2,7 @@ # Contributor: Iacopo Isimbaldi pkgname=zfs-dkms -pkgver=0.8.2 +pkgver=0.8.3 pkgrel=1 pkgdesc="Kernel modules for the Zettabyte File System." arch=('any') @@ -13,10 +13,10 @@ provides=("${pkgname%-dkms}" 'spl-dkms') replaces=('spl-dkms') source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc} "0001-only-build-the-module-in-dkms.conf.patch") -sha256sums=('47608e257c8ecebb918014ef1da6172c3a45d990885891af18e80f5cc28beab8' +sha256sums=('545a4897ce30c2d2dd9010a0fdb600a0d3d45805e2387093c473efc03aa9d7fd' 'SKIP' '780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409') -b2sums=('5c15f6664ca70f0deeb5b9e32f2bcff68f9821529e5203ff18612ce88473fee9af369354c442f3db7882d301cf17c805c9635b05bfd3460833ed8e5ff8004dd0' +b2sums=('8b51b9d5b61543566bc7839d8452fdf9358442155e95f93a011531338824bbd4fc8879500e276b02d5d49d504a046728ecc0c6154f69eb7b47180b9bb0e46958' 'SKIP' '1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50') validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) -- cgit v1.2.1 From d364766c9b790b02ca72e38146a7d7ee21ca05ae Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Fri, 28 Feb 2020 12:42:28 -0500 Subject: upgpkg: zfs-dkms 0.8.3-2 backport kernel 5.5 compilation failure add virtual dependency for FOO-MODULE which can be used to depend on "some form of zfs kernel module" rather than hardcoding -dkms or a specific kernel. --- .SRCINFO | 9 +++++++-- PKGBUILD | 12 ++++++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 93f2caa..b283878 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,24 +1,29 @@ pkgbase = zfs-dkms pkgdesc = Kernel modules for the Zettabyte File System. pkgver = 0.8.3 - pkgrel = 1 + pkgrel = 2 url = https://zfsonlinux.org/ arch = any license = CDDL - provides = zfs + provides = ZFS-MODULE=0.8.3 + provides = SPL-MODULE=0.8.3 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 = 0001-only-build-the-module-in-dkms.conf.patch validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027 validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B sha256sums = 545a4897ce30c2d2dd9010a0fdb600a0d3d45805e2387093c473efc03aa9d7fd sha256sums = SKIP + sha256sums = daae58460243c45c2c7505b1d88dcb299ea7d92bcf3f41d2d30bc213000bb1da sha256sums = 780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409 b2sums = 8b51b9d5b61543566bc7839d8452fdf9358442155e95f93a011531338824bbd4fc8879500e276b02d5d49d504a046728ecc0c6154f69eb7b47180b9bb0e46958 b2sums = SKIP + b2sums = d221881cd4c1edc0af010343b34c941ec8bf11bf34378eef09bb5152d442f0552a527f46105ace2af76dd4b2ff4ad93d6f39fd1be3f42ccda837d0208d7f4365 b2sums = 1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50 pkgname = zfs-dkms diff --git a/PKGBUILD b/PKGBUILD index a4d2880..0e50110 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,21 +3,26 @@ pkgname=zfs-dkms pkgver=0.8.3 -pkgrel=1 +pkgrel=2 pkgdesc="Kernel modules for the Zettabyte File System." arch=('any') url="https://zfsonlinux.org/" license=('CDDL') conflicts=('spl-dkms') -provides=("${pkgname%-dkms}" 'spl-dkms') +provides=("ZFS-MODULE=${pkgver}" "SPL-MODULE=${pkgver}" 'spl-dkms') +# ambiguous, provided for backwards compat, pls don't use +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" "0001-only-build-the-module-in-dkms.conf.patch") sha256sums=('545a4897ce30c2d2dd9010a0fdb600a0d3d45805e2387093c473efc03aa9d7fd' 'SKIP' + 'daae58460243c45c2c7505b1d88dcb299ea7d92bcf3f41d2d30bc213000bb1da' '780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409') b2sums=('8b51b9d5b61543566bc7839d8452fdf9358442155e95f93a011531338824bbd4fc8879500e276b02d5d49d504a046728ecc0c6154f69eb7b47180b9bb0e46958' 'SKIP' + 'd221881cd4c1edc0af010343b34c941ec8bf11bf34378eef09bb5152d442f0552a527f46105ace2af76dd4b2ff4ad93d6f39fd1be3f42ccda837d0208d7f4365' '1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50') validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) 'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf @@ -25,6 +30,9 @@ 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 + patch -p1 -i ../0001-only-build-the-module-in-dkms.conf.patch # remove unneeded sections from module build -- cgit v1.2.1 From e4f228252dd51cc7a32b38fe417c03c0750480f9 Mon Sep 17 00:00:00 2001 From: Frederik Schwan Date: Tue, 7 Apr 2020 01:10:42 +0200 Subject: upgpkg: zfs-dkms 0.8.3-3 fix build with kernel 5.6 --- 0002-fix-5.6-build.patch | 676 +++++++++++++++++++++++++++++++++++++++++++++++ PKGBUILD | 8 +- 2 files changed, 683 insertions(+), 1 deletion(-) create mode 100644 0002-fix-5.6-build.patch diff --git a/0002-fix-5.6-build.patch b/0002-fix-5.6-build.patch new file mode 100644 index 0000000..ce96f26 --- /dev/null +++ b/0002-fix-5.6-build.patch @@ -0,0 +1,676 @@ +From 02906709cd4d17ab06b5ef48796531838dce4e0c Mon Sep 17 00:00:00 2001 +From: Brian Behlendorf +Date: Thu, 6 Feb 2020 10:30:41 -0800 +Subject: [PATCH 1/4] Linux 5.6 compat: struct proc_ops + +The proc_ops structure was introduced to replace the use of of the +file_operations structure when registering proc handlers. This +change creates a new kstat_proc_op_t typedef for compatibility +which can be used to pass around the correct structure. + +This change additionally adds the 'const' keyword to all of the +existing proc operations structures. + +Reviewed-by: Tony Hutter +Signed-off-by: Brian Behlendorf +Closes #9961 +(cherry picked from commit 0dd73648532e8654e07c28bba6c80bfb779a4938) +--- + config/kernel-proc-operations.m4 | 41 ++++++++++++++++++++++++++++++++ + config/kernel.m4 | 2 ++ + include/spl/sys/kstat.h | 8 ++++++- + module/spl/spl-kstat.c | 14 ++++++++--- + module/spl/spl-proc.c | 33 ++++++++++++++++++++----- + module/spl/spl-procfs-list.c | 11 +++++++-- + 6 files changed, 97 insertions(+), 12 deletions(-) + create mode 100644 config/kernel-proc-operations.m4 + +diff --git a/config/kernel-proc-operations.m4 b/config/kernel-proc-operations.m4 +new file mode 100644 +index 000000000..df216222e +--- /dev/null ++++ b/config/kernel-proc-operations.m4 +@@ -0,0 +1,41 @@ ++dnl # ++dnl # 5.6 API Change ++dnl # The proc_ops structure was introduced to replace the use of ++dnl # of the file_operations structure when registering proc handlers. ++dnl # ++AC_DEFUN([ZFS_AC_KERNEL_SRC_PROC_OPERATIONS], [ ++ ZFS_LINUX_TEST_SRC([proc_ops_struct], [ ++ #include ++ ++ int test_open(struct inode *ip, struct file *fp) { return 0; } ++ ssize_t test_read(struct file *fp, char __user *ptr, ++ size_t size, loff_t *offp) { return 0; } ++ ssize_t test_write(struct file *fp, const char __user *ptr, ++ size_t size, loff_t *offp) { return 0; } ++ loff_t test_lseek(struct file *fp, loff_t off, int flag) ++ { return 0; } ++ int test_release(struct inode *ip, struct file *fp) ++ { return 0; } ++ ++ const struct proc_ops test_ops __attribute__ ((unused)) = { ++ .proc_open = test_open, ++ .proc_read = test_read, ++ .proc_write = test_write, ++ .proc_lseek = test_lseek, ++ .proc_release = test_release, ++ }; ++ ], [ ++ struct proc_dir_entry *entry __attribute__ ((unused)) = ++ proc_create_data("test", 0444, NULL, &test_ops, NULL); ++ ]) ++]) ++ ++AC_DEFUN([ZFS_AC_KERNEL_PROC_OPERATIONS], [ ++ AC_MSG_CHECKING([whether proc_ops structure exists]) ++ ZFS_LINUX_TEST_RESULT([proc_ops_struct], [ ++ AC_MSG_RESULT(yes) ++ AC_DEFINE(HAVE_PROC_OPS_STRUCT, 1, [proc_ops structure exists]) ++ ], [ ++ AC_MSG_RESULT(no) ++ ]) ++]) +diff --git a/config/kernel.m4 b/config/kernel.m4 +index dce619729..3a5409b07 100644 +--- a/config/kernel.m4 ++++ b/config/kernel.m4 +@@ -54,6 +54,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [ + ZFS_AC_KERNEL_SRC_CURRENT_BIO_TAIL + ZFS_AC_KERNEL_SRC_SUPER_USER_NS + ZFS_AC_KERNEL_SRC_SUBMIT_BIO ++ ZFS_AC_KERNEL_SRC_PROC_OPERATIONS + ZFS_AC_KERNEL_SRC_BLOCK_DEVICE_OPERATIONS + ZFS_AC_KERNEL_SRC_BLKDEV_GET_BY_PATH + ZFS_AC_KERNEL_SRC_BLKDEV_REREAD_PART +@@ -169,6 +170,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [ + ZFS_AC_KERNEL_TIMER_SETUP + ZFS_AC_KERNEL_CURRENT_BIO_TAIL + ZFS_AC_KERNEL_SUPER_USER_NS ++ ZFS_AC_KERNEL_PROC_OPERATIONS + ZFS_AC_KERNEL_SUBMIT_BIO + ZFS_AC_KERNEL_BLOCK_DEVICE_OPERATIONS + ZFS_AC_KERNEL_BLKDEV_GET_BY_PATH +diff --git a/include/spl/sys/kstat.h b/include/spl/sys/kstat.h +index 3ce474248..c93c53171 100644 +--- a/include/spl/sys/kstat.h ++++ b/include/spl/sys/kstat.h +@@ -152,6 +152,12 @@ typedef struct kstat_named_s { + #define KSTAT_NAMED_STR_PTR(knptr) ((knptr)->value.string.addr.ptr) + #define KSTAT_NAMED_STR_BUFLEN(knptr) ((knptr)->value.string.len) + ++#ifdef HAVE_PROC_OPS_STRUCT ++typedef struct proc_ops kstat_proc_op_t; ++#else ++typedef struct file_operations kstat_proc_op_t; ++#endif ++ + typedef struct kstat_intr { + uint_t intrs[KSTAT_NUM_INTRS]; + } kstat_intr_t; +@@ -197,7 +203,7 @@ extern void kstat_proc_entry_init(kstat_proc_entry_t *kpep, + const char *module, const char *name); + extern void kstat_proc_entry_delete(kstat_proc_entry_t *kpep); + extern void kstat_proc_entry_install(kstat_proc_entry_t *kpep, mode_t mode, +- const struct file_operations *file_ops, void *data); ++ const kstat_proc_op_t *file_ops, void *data); + + extern void __kstat_install(kstat_t *ksp); + extern void __kstat_delete(kstat_t *ksp); +diff --git a/module/spl/spl-kstat.c b/module/spl/spl-kstat.c +index c97b6d6cb..c54378ace 100644 +--- a/module/spl/spl-kstat.c ++++ b/module/spl/spl-kstat.c +@@ -507,12 +507,20 @@ proc_kstat_write(struct file *filp, const char __user *buf, size_t len, + return (len); + } + +-static struct file_operations proc_kstat_operations = { ++static const kstat_proc_op_t proc_kstat_operations = { ++#ifdef HAVE_PROC_OPS_STRUCT ++ .proc_open = proc_kstat_open, ++ .proc_write = proc_kstat_write, ++ .proc_read = seq_read, ++ .proc_lseek = seq_lseek, ++ .proc_release = seq_release, ++#else + .open = proc_kstat_open, + .write = proc_kstat_write, + .read = seq_read, + .llseek = seq_lseek, + .release = seq_release, ++#endif + }; + + void +@@ -656,7 +664,7 @@ kstat_detect_collision(kstat_proc_entry_t *kpep) + */ + void + kstat_proc_entry_install(kstat_proc_entry_t *kpep, mode_t mode, +- const struct file_operations *file_ops, void *data) ++ const kstat_proc_op_t *proc_ops, void *data) + { + kstat_module_t *module; + kstat_proc_entry_t *tmp = NULL; +@@ -690,7 +698,7 @@ kstat_proc_entry_install(kstat_proc_entry_t *kpep, mode_t mode, + + kpep->kpe_owner = module; + kpep->kpe_proc = proc_create_data(kpep->kpe_name, mode, +- module->ksm_proc, file_ops, data); ++ module->ksm_proc, proc_ops, data); + if (kpep->kpe_proc == NULL) { + list_del_init(&kpep->kpe_list); + if (list_empty(&module->ksm_kstat_list)) +diff --git a/module/spl/spl-proc.c b/module/spl/spl-proc.c +index c0c13913c..40315ede3 100644 +--- a/module/spl/spl-proc.c ++++ b/module/spl/spl-proc.c +@@ -532,11 +532,18 @@ proc_slab_open(struct inode *inode, struct file *filp) + return (seq_open(filp, &slab_seq_ops)); + } + +-static struct file_operations proc_slab_operations = { +- .open = proc_slab_open, +- .read = seq_read, +- .llseek = seq_lseek, ++static const kstat_proc_op_t proc_slab_operations = { ++#ifdef HAVE_PROC_OPS_STRUCT ++ .proc_open = proc_slab_open, ++ .proc_read = seq_read, ++ .proc_lseek = seq_lseek, ++ .proc_release = seq_release, ++#else ++ .open = proc_slab_open, ++ .read = seq_read, ++ .llseek = seq_lseek, + .release = seq_release, ++#endif + }; + + static void +@@ -571,18 +578,32 @@ proc_taskq_open(struct inode *inode, struct file *filp) + return (seq_open(filp, &taskq_seq_ops)); + } + +-static struct file_operations proc_taskq_all_operations = { ++static const kstat_proc_op_t proc_taskq_all_operations = { ++#ifdef HAVE_PROC_OPS_STRUCT ++ .proc_open = proc_taskq_all_open, ++ .proc_read = seq_read, ++ .proc_lseek = seq_lseek, ++ .proc_release = seq_release, ++#else + .open = proc_taskq_all_open, + .read = seq_read, + .llseek = seq_lseek, + .release = seq_release, ++#endif + }; + +-static struct file_operations proc_taskq_operations = { ++static const kstat_proc_op_t proc_taskq_operations = { ++#ifdef HAVE_PROC_OPS_STRUCT ++ .proc_open = proc_taskq_open, ++ .proc_read = seq_read, ++ .proc_lseek = seq_lseek, ++ .proc_release = seq_release, ++#else + .open = proc_taskq_open, + .read = seq_read, + .llseek = seq_lseek, + .release = seq_release, ++#endif + }; + + static struct ctl_table spl_kmem_table[] = { +diff --git a/module/spl/spl-procfs-list.c b/module/spl/spl-procfs-list.c +index f6a00da5c..189d6a7c6 100644 +--- a/module/spl/spl-procfs-list.c ++++ b/module/spl/spl-procfs-list.c +@@ -185,13 +185,20 @@ procfs_list_write(struct file *filp, const char __user *buf, size_t len, + return (len); + } + +-static struct file_operations procfs_list_operations = { +- .owner = THIS_MODULE, ++static const kstat_proc_op_t procfs_list_operations = { ++#ifdef HAVE_PROC_OPS_STRUCT ++ .proc_open = procfs_list_open, ++ .proc_write = procfs_list_write, ++ .proc_read = seq_read, ++ .proc_lseek = seq_lseek, ++ .proc_release = seq_release_private, ++#else + .open = procfs_list_open, + .write = procfs_list_write, + .read = seq_read, + .llseek = seq_lseek, + .release = seq_release_private, ++#endif + }; + + /* +-- +2.26.0 + + +From 7a1b4338ec69e01acf2f1eaee617646621c72c81 Mon Sep 17 00:00:00 2001 +From: Brian Behlendorf +Date: Thu, 6 Feb 2020 12:37:25 -0800 +Subject: [PATCH 2/4] Linux 5.6 compat: timestamp_truncate() + +The timestamp_truncate() function was added, it replaces the existing +timespec64_trunc() function. This change renames our wrapper function +to be consistent with the upstream name and updates the compatibility +code for older kernels accordingly. + +Reviewed-by: Tony Hutter +Signed-off-by: Brian Behlendorf +Closes #9956 +Closes #9961 +(cherry picked from commit 795699a6cc28b8f1059397e03d1a86d576bfc7dc) +--- + config/kernel-inode-times.m4 | 31 +++++++++++++++++++++++++++---- + include/sys/zpl.h | 13 +++++++------ + module/zfs/zfs_vnops.c | 8 ++++---- + module/zfs/zpl_inode.c | 6 ++---- + 4 files changed, 40 insertions(+), 18 deletions(-) + +diff --git a/config/kernel-inode-times.m4 b/config/kernel-inode-times.m4 +index 57e7f31fd..8a79c299e 100644 +--- a/config/kernel-inode-times.m4 ++++ b/config/kernel-inode-times.m4 +@@ -1,8 +1,22 @@ +-dnl # +-dnl # 4.18 API change +-dnl # i_atime, i_mtime, and i_ctime changed from timespec to timespec64. +-dnl # + AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_TIMES], [ ++ ++ dnl # ++ dnl # 5.6 API change ++ dnl # timespec64_trunc() replaced by timestamp_truncate() interface. ++ dnl # ++ ZFS_LINUX_TEST_SRC([timestamp_truncate], [ ++ #include ++ ],[ ++ struct timespec64 ts; ++ struct inode ip; ++ ++ ts = timestamp_truncate(ts, &ip); ++ ]) ++ ++ dnl # ++ dnl # 4.18 API change ++ dnl # i_atime, i_mtime, and i_ctime changed from timespec to timespec64. ++ dnl # + ZFS_LINUX_TEST_SRC([inode_times], [ + #include + ],[ +@@ -15,6 +29,15 @@ AC_DEFUN([ZFS_AC_KERNEL_SRC_INODE_TIMES], [ + ]) + + AC_DEFUN([ZFS_AC_KERNEL_INODE_TIMES], [ ++ AC_MSG_CHECKING([whether timestamp_truncate() exists]) ++ ZFS_LINUX_TEST_RESULT([timestamp_truncate], [ ++ AC_MSG_RESULT(yes) ++ AC_DEFINE(HAVE_INODE_TIMESTAMP_TRUNCATE, 1, ++ [timestamp_truncate() exists]) ++ ],[ ++ AC_MSG_RESULT(no) ++ ]) ++ + AC_MSG_CHECKING([whether inode->i_*time's are timespec64]) + ZFS_LINUX_TEST_RESULT([inode_times], [ + AC_MSG_RESULT(no) +diff --git a/include/sys/zpl.h b/include/sys/zpl.h +index 2766269f3..f88ccd540 100644 +--- a/include/sys/zpl.h ++++ b/include/sys/zpl.h +@@ -188,13 +188,14 @@ zpl_dir_emit_dots(struct file *file, zpl_dir_context_t *ctx) + } + #endif /* HAVE_VFS_ITERATE */ + +-/* +- * Linux 4.18, inode times converted from timespec to timespec64. +- */ +-#if defined(HAVE_INODE_TIMESPEC64_TIMES) +-#define zpl_inode_timespec_trunc(ts, gran) timespec64_trunc(ts, gran) ++#if defined(HAVE_INODE_TIMESTAMP_TRUNCATE) ++#define zpl_inode_timestamp_truncate(ts, ip) timestamp_truncate(ts, ip) ++#elif defined(HAVE_INODE_TIMESPEC64_TIMES) ++#define zpl_inode_timestamp_truncate(ts, ip) \ ++ timespec64_trunc(ts, (ip)->i_sb->s_time_gran) + #else +-#define zpl_inode_timespec_trunc(ts, gran) timespec_trunc(ts, gran) ++#define zpl_inode_timestamp_truncate(ts, ip) \ ++ timespec_trunc(ts, (ip)->i_sb->s_time_gran) + #endif + + #endif /* _SYS_ZPL_H */ +diff --git a/module/zfs/zfs_vnops.c b/module/zfs/zfs_vnops.c +index 03a8c4a50..c322edf6a 100644 +--- a/module/zfs/zfs_vnops.c ++++ b/module/zfs/zfs_vnops.c +@@ -3415,8 +3415,8 @@ top: + + if (mask & (ATTR_MTIME | ATTR_SIZE)) { + ZFS_TIME_ENCODE(&vap->va_mtime, mtime); +- ZTOI(zp)->i_mtime = zpl_inode_timespec_trunc(vap->va_mtime, +- ZTOI(zp)->i_sb->s_time_gran); ++ ZTOI(zp)->i_mtime = zpl_inode_timestamp_truncate( ++ vap->va_mtime, ZTOI(zp)); + + SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_MTIME(zfsvfs), NULL, + mtime, sizeof (mtime)); +@@ -3424,8 +3424,8 @@ top: + + if (mask & (ATTR_CTIME | ATTR_SIZE)) { + ZFS_TIME_ENCODE(&vap->va_ctime, ctime); +- ZTOI(zp)->i_ctime = zpl_inode_timespec_trunc(vap->va_ctime, +- ZTOI(zp)->i_sb->s_time_gran); ++ ZTOI(zp)->i_ctime = zpl_inode_timestamp_truncate(vap->va_ctime, ++ ZTOI(zp)); + SA_ADD_BULK_ATTR(bulk, count, SA_ZPL_CTIME(zfsvfs), NULL, + ctime, sizeof (ctime)); + } +diff --git a/module/zfs/zpl_inode.c b/module/zfs/zpl_inode.c +index 5660f8b0e..1f228dcf8 100644 +--- a/module/zfs/zpl_inode.c ++++ b/module/zfs/zpl_inode.c +@@ -390,10 +390,8 @@ zpl_setattr(struct dentry *dentry, struct iattr *ia) + vap->va_mtime = ia->ia_mtime; + vap->va_ctime = ia->ia_ctime; + +- if (vap->va_mask & ATTR_ATIME) { +- ip->i_atime = zpl_inode_timespec_trunc(ia->ia_atime, +- ip->i_sb->s_time_gran); +- } ++ if (vap->va_mask & ATTR_ATIME) ++ ip->i_atime = zpl_inode_timestamp_truncate(ia->ia_atime, ip); + + cookie = spl_fstrans_mark(); + error = -zfs_setattr(ip, vap, 0, cr); +-- +2.26.0 + + +From 3aed5107cd5645a373fc4c352693c9bf8f2bbd61 Mon Sep 17 00:00:00 2001 +From: Brian Behlendorf +Date: Wed, 26 Feb 2020 12:42:33 -0800 +Subject: [PATCH 3/4] Linux 5.6 compat: ktime_get_raw_ts64() + +The getrawmonotonic() and getrawmonotonic64() interfaces have been +fully retired. Update gethrtime() to use the replacement interface +ktime_get_raw_ts64() which was introduced in the 4.18 kernel. + +Reviewed-by: Tony Hutter +Signed-off-by: Brian Behlendorf +Closes #10052 +Closes #10064 +(cherry picked from commit ff5587d651371ab496f7962e85fe2c337fdb8a59) +--- + config/kernel-ktime.m4 | 55 +++++++++++++++++++++ + config/kernel-ktime_get_coarse_real_ts64.m4 | 23 --------- + config/kernel.m4 | 4 +- + include/spl/sys/time.h | 5 ++ + 4 files changed, 62 insertions(+), 25 deletions(-) + create mode 100644 config/kernel-ktime.m4 + delete mode 100644 config/kernel-ktime_get_coarse_real_ts64.m4 + +diff --git a/config/kernel-ktime.m4 b/config/kernel-ktime.m4 +new file mode 100644 +index 000000000..64c3b5f90 +--- /dev/null ++++ b/config/kernel-ktime.m4 +@@ -0,0 +1,55 @@ ++dnl # ++dnl # 4.18: ktime_get_coarse_real_ts64() replaces current_kernel_time64(). ++dnl # ++AC_DEFUN([ZFS_AC_KERNEL_SRC_KTIME_GET_COARSE_REAL_TS64], [ ++ ZFS_LINUX_TEST_SRC([ktime_get_coarse_real_ts64], [ ++ #include ++ ], [ ++ struct timespec64 ts; ++ ktime_get_coarse_real_ts64(&ts); ++ ]) ++]) ++ ++AC_DEFUN([ZFS_AC_KERNEL_KTIME_GET_COARSE_REAL_TS64], [ ++ AC_MSG_CHECKING([whether ktime_get_coarse_real_ts64() exists]) ++ ZFS_LINUX_TEST_RESULT([ktime_get_coarse_real_ts64], [ ++ AC_MSG_RESULT(yes) ++ AC_DEFINE(HAVE_KTIME_GET_COARSE_REAL_TS64, 1, ++ [ktime_get_coarse_real_ts64() exists]) ++ ], [ ++ AC_MSG_RESULT(no) ++ ]) ++]) ++ ++dnl # ++dnl # 4.18: ktime_get_raw_ts64() replaces getrawmonotonic64(). ++dnl # ++AC_DEFUN([ZFS_AC_KERNEL_SRC_KTIME_GET_RAW_TS64], [ ++ ZFS_LINUX_TEST_SRC([ktime_get_raw_ts64], [ ++ #include ++ ], [ ++ struct timespec64 ts; ++ ktime_get_raw_ts64(&ts); ++ ]) ++]) ++ ++AC_DEFUN([ZFS_AC_KERNEL_KTIME_GET_RAW_TS64], [ ++ AC_MSG_CHECKING([whether ktime_get_raw_ts64() exists]) ++ ZFS_LINUX_TEST_RESULT([ktime_get_raw_ts64], [ ++ AC_MSG_RESULT(yes) ++ AC_DEFINE(HAVE_KTIME_GET_RAW_TS64, 1, ++ [ktime_get_raw_ts64() exists]) ++ ], [ ++ AC_MSG_RESULT(no) ++ ]) ++]) ++ ++AC_DEFUN([ZFS_AC_KERNEL_SRC_KTIME], [ ++ ZFS_AC_KERNEL_SRC_KTIME_GET_COARSE_REAL_TS64 ++ ZFS_AC_KERNEL_SRC_KTIME_GET_RAW_TS64 ++]) ++ ++AC_DEFUN([ZFS_AC_KERNEL_KTIME], [ ++ ZFS_AC_KERNEL_KTIME_GET_COARSE_REAL_TS64 ++ ZFS_AC_KERNEL_KTIME_GET_RAW_TS64 ++]) +diff --git a/config/kernel-ktime_get_coarse_real_ts64.m4 b/config/kernel-ktime_get_coarse_real_ts64.m4 +deleted file mode 100644 +index 28492bf04..000000000 +--- a/config/kernel-ktime_get_coarse_real_ts64.m4 ++++ /dev/null +@@ -1,23 +0,0 @@ +-dnl # +-dnl # 4.18: ktime_get_coarse_real_ts64() added. Use it in place of +-dnl # current_kernel_time64(). +-dnl # +-AC_DEFUN([ZFS_AC_KERNEL_SRC_KTIME_GET_COARSE_REAL_TS64], [ +- ZFS_LINUX_TEST_SRC([ktime_get_coarse_real_ts64], [ +- #include +- ], [ +- struct timespec64 ts; +- ktime_get_coarse_real_ts64(&ts); +- ]) +-]) +- +-AC_DEFUN([ZFS_AC_KERNEL_KTIME_GET_COARSE_REAL_TS64], [ +- AC_MSG_CHECKING([whether ktime_get_coarse_real_ts64() exists]) +- ZFS_LINUX_TEST_RESULT([ktime_get_coarse_real_ts64], [ +- AC_MSG_RESULT(yes) +- AC_DEFINE(HAVE_KTIME_GET_COARSE_REAL_TS64, 1, +- [ktime_get_coarse_real_ts64() exists]) +- ], [ +- AC_MSG_RESULT(no) +- ]) +-]) +diff --git a/config/kernel.m4 b/config/kernel.m4 +index 3a5409b07..383f92984 100644 +--- a/config/kernel.m4 ++++ b/config/kernel.m4 +@@ -137,7 +137,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_SRC], [ + ZFS_AC_KERNEL_SRC_CURRENT_TIME + ZFS_AC_KERNEL_SRC_USERNS_CAPABILITIES + ZFS_AC_KERNEL_SRC_IN_COMPAT_SYSCALL +- ZFS_AC_KERNEL_SRC_KTIME_GET_COARSE_REAL_TS64 ++ ZFS_AC_KERNEL_SRC_KTIME + ZFS_AC_KERNEL_SRC_TOTALRAM_PAGES_FUNC + ZFS_AC_KERNEL_SRC_TOTALHIGH_PAGES + ZFS_AC_KERNEL_SRC_KSTRTOUL +@@ -254,7 +254,7 @@ AC_DEFUN([ZFS_AC_KERNEL_TEST_RESULT], [ + ZFS_AC_KERNEL_CURRENT_TIME + ZFS_AC_KERNEL_USERNS_CAPABILITIES + ZFS_AC_KERNEL_IN_COMPAT_SYSCALL +- ZFS_AC_KERNEL_KTIME_GET_COARSE_REAL_TS64 ++ ZFS_AC_KERNEL_KTIME + ZFS_AC_KERNEL_TOTALRAM_PAGES_FUNC + ZFS_AC_KERNEL_TOTALHIGH_PAGES + ZFS_AC_KERNEL_KSTRTOUL +diff --git a/include/spl/sys/time.h b/include/spl/sys/time.h +index 312415b7b..56fd725c0 100644 +--- a/include/spl/sys/time.h ++++ b/include/spl/sys/time.h +@@ -105,8 +105,13 @@ gethrestime_sec(void) + static inline hrtime_t + gethrtime(void) + { ++#if defined(HAVE_KTIME_GET_RAW_TS64) ++ struct timespec64 ts; ++ ktime_get_raw_ts64(&ts); ++#else + struct timespec ts; + getrawmonotonic(&ts); ++#endif + return (((hrtime_t)ts.tv_sec * NSEC_PER_SEC) + ts.tv_nsec); + } + +-- +2.26.0 + + +From 6f38b244502f763d6e20290397ccb29d628499fa Mon Sep 17 00:00:00 2001 +From: Brian Behlendorf +Date: Wed, 26 Feb 2020 13:18:07 -0800 +Subject: [PATCH 4/4] Linux 5.6 compat: time_t + +As part of the Linux kernel's y2038 changes the time_t type has been +fully retired. Callers are now required to use the time64_t type. + +Rather than move to the new type, I've removed the few remaining +places where a time_t is used in the kernel code. They've been +replaced with a uint64_t which is already how ZFS internally +handled these values. + +Going forward we should work towards updating the remaining user +space time_t consumers to the 64-bit interfaces. + +Reviewed-by: Matthew Macy +Reviewed-by: Tony Hutter +Signed-off-by: Brian Behlendorf +Closes #10052 +Closes #10064 +(cherry picked from commit 2c3a83701dd185cadb30db4556256534e2930c7d) +--- + include/spl/sys/time.h | 2 +- + include/sys/vdev_impl.h | 4 ++-- + lib/libspl/include/sys/time.h | 2 +- + module/zfs/vdev_initialize.c | 2 +- + module/zfs/vdev_trim.c | 2 +- + module/zfs/zfs_debug.c | 2 +- + 6 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/include/spl/sys/time.h b/include/spl/sys/time.h +index 56fd725c0..4309c300b 100644 +--- a/include/spl/sys/time.h ++++ b/include/spl/sys/time.h +@@ -85,7 +85,7 @@ gethrestime(inode_timespec_t *ts) + #endif + } + +-static inline time_t ++static inline uint64_t + gethrestime_sec(void) + { + #if defined(HAVE_INODE_TIMESPEC64_TIMES) +diff --git a/include/sys/vdev_impl.h b/include/sys/vdev_impl.h +index f6f7bbb4b..090ba3fbc 100644 +--- a/include/sys/vdev_impl.h ++++ b/include/sys/vdev_impl.h +@@ -274,7 +274,7 @@ struct vdev { + range_tree_t *vdev_initialize_tree; /* valid while initializing */ + uint64_t vdev_initialize_bytes_est; + uint64_t vdev_initialize_bytes_done; +- time_t vdev_initialize_action_time; /* start and end time */ ++ uint64_t vdev_initialize_action_time; /* start and end time */ + + /* TRIM related */ + boolean_t vdev_trim_exit_wanted; +@@ -295,7 +295,7 @@ struct vdev { + uint64_t vdev_trim_rate; /* requested rate (bytes/sec) */ + uint64_t vdev_trim_partial; /* requested partial TRIM */ + uint64_t vdev_trim_secure; /* requested secure TRIM */ +- time_t vdev_trim_action_time; /* start and end time */ ++ uint64_t vdev_trim_action_time; /* start and end time */ + + /* for limiting outstanding I/Os (initialize and TRIM) */ + kmutex_t vdev_initialize_io_lock; +diff --git a/lib/libspl/include/sys/time.h b/lib/libspl/include/sys/time.h +index 291f2190a..c9f616504 100644 +--- a/lib/libspl/include/sys/time.h ++++ b/lib/libspl/include/sys/time.h +@@ -88,7 +88,7 @@ gethrestime(inode_timespec_t *ts) + ts->tv_nsec = tv.tv_usec * NSEC_PER_USEC; + } + +-static inline time_t ++static inline uint64_t + gethrestime_sec(void) + { + struct timeval tv; +diff --git a/module/zfs/vdev_initialize.c b/module/zfs/vdev_initialize.c +index 9958a2958..8a3635969 100644 +--- a/module/zfs/vdev_initialize.c ++++ b/module/zfs/vdev_initialize.c +@@ -700,7 +700,7 @@ vdev_initialize_restart(vdev_t *vd) + vd->vdev_leaf_zap, VDEV_LEAF_ZAP_INITIALIZE_ACTION_TIME, + sizeof (timestamp), 1, ×tamp); + ASSERT(err == 0 || err == ENOENT); +- vd->vdev_initialize_action_time = (time_t)timestamp; ++ vd->vdev_initialize_action_time = timestamp; + + if (vd->vdev_initialize_state == VDEV_INITIALIZE_SUSPENDED || + vd->vdev_offline) { +diff --git a/module/zfs/vdev_trim.c b/module/zfs/vdev_trim.c +index 5ad47cccd..b7548fc4c 100644 +--- a/module/zfs/vdev_trim.c ++++ b/module/zfs/vdev_trim.c +@@ -1046,7 +1046,7 @@ vdev_trim_restart(vdev_t *vd) + vd->vdev_leaf_zap, VDEV_LEAF_ZAP_TRIM_ACTION_TIME, + sizeof (timestamp), 1, ×tamp); + ASSERT(err == 0 || err == ENOENT); +- vd->vdev_trim_action_time = (time_t)timestamp; ++ vd->vdev_trim_action_time = timestamp; + + if (vd->vdev_trim_state == VDEV_TRIM_SUSPENDED || + vd->vdev_offline) { +diff --git a/module/zfs/zfs_debug.c b/module/zfs/zfs_debug.c +index 538533d27..cf8bbb3ce 100644 +--- a/module/zfs/zfs_debug.c ++++ b/module/zfs/zfs_debug.c +@@ -27,7 +27,7 @@ + + typedef struct zfs_dbgmsg { + procfs_list_node_t zdm_node; +- time_t zdm_timestamp; ++ uint64_t zdm_timestamp; + int zdm_size; + char zdm_msg[1]; /* variable length allocation */ + } zfs_dbgmsg_t; +-- +2.26.0 + diff --git a/PKGBUILD b/PKGBUILD index e1ee480..bd86158 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,7 +5,7 @@ pkgname=zfs-dkms pkgver=0.8.3 -pkgrel=2 +pkgrel=3 pkgdesc="Kernel modules for the Zettabyte File System." arch=('any') url="https://zfsonlinux.org/" @@ -17,14 +17,17 @@ 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' 'SKIP' 'daae58460243c45c2c7505b1d88dcb299ea7d92bcf3f41d2d30bc213000bb1da' + '6b9e9ef7b4ddd0a34acc5622c7b0c408f2251ddfc3805f27a6b2b27b984ad430' '780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409') b2sums=('8b51b9d5b61543566bc7839d8452fdf9358442155e95f93a011531338824bbd4fc8879500e276b02d5d49d504a046728ecc0c6154f69eb7b47180b9bb0e46958' 'SKIP' 'd221881cd4c1edc0af010343b34c941ec8bf11bf34378eef09bb5152d442f0552a527f46105ace2af76dd4b2ff4ad93d6f39fd1be3f42ccda837d0208d7f4365' + '2115059a70a8431769d2f556c300380099c6b9e42eaa939319a0afacdf44f45e6a6bb53333378c708fb4fc2c79b4a9d37bfb6a0bce776f9963accd9fdaf9be81' '1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50') validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) 'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf @@ -35,6 +38,9 @@ prepare() { # 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 -- cgit v1.2.1 From 73e28468dffe1d5a00083ddb9e75e015c7f0cf52 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Tue, 14 Apr 2020 16:17:32 -0400 Subject: zfs-dkms: also update the .SRCINFO which did not happen due to cherry-picking meh --- .SRCINFO | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.SRCINFO b/.SRCINFO index b283878..30892cd 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = zfs-dkms pkgdesc = Kernel modules for the Zettabyte File System. pkgver = 0.8.3 - pkgrel = 2 + pkgrel = 3 url = https://zfsonlinux.org/ arch = any license = CDDL @@ -14,16 +14,19 @@ pkgbase = zfs-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 = 0001-only-build-the-module-in-dkms.conf.patch validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027 validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B sha256sums = 545a4897ce30c2d2dd9010a0fdb600a0d3d45805e2387093c473efc03aa9d7fd sha256sums = SKIP sha256sums = daae58460243c45c2c7505b1d88dcb299ea7d92bcf3f41d2d30bc213000bb1da + sha256sums = 6b9e9ef7b4ddd0a34acc5622c7b0c408f2251ddfc3805f27a6b2b27b984ad430 sha256sums = 780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409 b2sums = 8b51b9d5b61543566bc7839d8452fdf9358442155e95f93a011531338824bbd4fc8879500e276b02d5d49d504a046728ecc0c6154f69eb7b47180b9bb0e46958 b2sums = SKIP b2sums = d221881cd4c1edc0af010343b34c941ec8bf11bf34378eef09bb5152d442f0552a527f46105ace2af76dd4b2ff4ad93d6f39fd1be3f42ccda837d0208d7f4365 + b2sums = 2115059a70a8431769d2f556c300380099c6b9e42eaa939319a0afacdf44f45e6a6bb53333378c708fb4fc2c79b4a9d37bfb6a0bce776f9963accd9fdaf9be81 b2sums = 1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50 pkgname = zfs-dkms -- cgit v1.2.1 From 8b1c76da7d2ef002327a5787b189c0f7d6f37be7 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Thu, 21 May 2020 10:54:55 -0400 Subject: upgpkg: zfs-dkms 0.8.4-1 upstream release --- .SRCINFO | 24 +++++++++--------------- PKGBUILD | 20 ++++---------------- 2 files changed, 13 insertions(+), 31 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 30892cd..be70c1d 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -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 diff --git a/PKGBUILD b/PKGBUILD index bd86158..55a6773 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -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) 'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf @@ -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 -- cgit v1.2.1 From 2da4ade5d260d4300fd0b789f9fdc16939d3fe42 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Thu, 18 Jun 2020 10:09:02 -0400 Subject: zfs-dkms*/: fix configure.ac modifications to allow all module/ files We want the toplevel Makefile/zfs.release and we *also* want all files in module/ to be configured, because that is the only subdirectory we use. It just happened that module/ used to only have Makefile.in to configure, so only permitting Makefiles which may or may not be prefixed with 'module/' worked. The current upstream master now has a Kbuild.in file, though, which broke this clumsy hack. Update to use a more beautiful variant of clumsy hack instead. --- PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD b/PKGBUILD index 55a6773..f44d677 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -35,7 +35,7 @@ prepare() { sed -ri "/AC_CONFIG_FILES/,/]\)/{ /AC_CONFIG_FILES/n /]\)/n -/^\s*(module\/.*)?(${pkgname%-dkms}.release|Makefile)/!d +/^\s*(module\/.*|${pkgname%-dkms}.release|Makefile)/!d }" configure.ac autoreconf -fi -- cgit v1.2.1 From 737fea45a7fa69113d1bcb355ec85fff6cd22ef7 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Fri, 21 Aug 2020 15:27:58 -0400 Subject: upgpkg: zfs-dkms 0.8.4-2 backport kernel 5.8 support from https://github.com/openzfs/zfs/pull/10728 (see https://github.com/openzfs/zfs/pull/10422) --- .SRCINFO | 6 ++++-- PKGBUILD | 8 +++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index be70c1d..6dbe266 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = zfs-dkms pkgdesc = Kernel modules for the Zettabyte File System. pkgver = 0.8.4 - pkgrel = 1 + pkgrel = 2 url = https://zfsonlinux.org/ arch = any license = CDDL @@ -13,17 +13,19 @@ pkgbase = zfs-dkms replaces = spl-dkms 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 = https://github.com/openzfs/zfs/commit/d90015c5439167456d02585c25147742453d9aa6.patch source = 0001-only-build-the-module-in-dkms.conf.patch validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027 validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B sha256sums = 2b988f5777976f09d08083f6bebf6e67219c4c4c183c1f33033fb7e5e5eacafb sha256sums = SKIP + sha256sums = e801bb4e820924b69289785976b280084b5b7d3bb2e9f9cc1a08710d6e5d898b sha256sums = 780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409 b2sums = 776bcd6dfab8825c07d315085e288b29bf543d6957325d5d566b7b78c04505dde9bd25eb6684cb4a1b6a657de8a4e1290d04d2b9079d26d6b834a70f1ec3b569 b2sums = SKIP + b2sums = 5375c5344ea88f6d2b1a4f9cf9c1efeae67a53ef487fe3962790f32d9dcff2622dd22f8f8b0f83b648fe1f490bd2e12e91f5d5fbfca274e1ec72aaa8f6c5e335 b2sums = 1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50 pkgname = zfs-dkms depends = zfs-utils=0.8.4 depends = dkms - diff --git a/PKGBUILD b/PKGBUILD index f44d677..4254167 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,7 +5,7 @@ pkgname=zfs-dkms pkgver=0.8.4 -pkgrel=1 +pkgrel=2 pkgdesc="Kernel modules for the Zettabyte File System." arch=('any') url="https://zfsonlinux.org/" @@ -16,12 +16,15 @@ 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/d90015c5439167456d02585c25147742453d9aa6.patch" "0001-only-build-the-module-in-dkms.conf.patch") sha256sums=('2b988f5777976f09d08083f6bebf6e67219c4c4c183c1f33033fb7e5e5eacafb' 'SKIP' + 'e801bb4e820924b69289785976b280084b5b7d3bb2e9f9cc1a08710d6e5d898b' '780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409') b2sums=('776bcd6dfab8825c07d315085e288b29bf543d6957325d5d566b7b78c04505dde9bd25eb6684cb4a1b6a657de8a4e1290d04d2b9079d26d6b834a70f1ec3b569' 'SKIP' + '5375c5344ea88f6d2b1a4f9cf9c1efeae67a53ef487fe3962790f32d9dcff2622dd22f8f8b0f83b648fe1f490bd2e12e91f5d5fbfca274e1ec72aaa8f6c5e335' '1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50') validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) 'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf @@ -29,6 +32,9 @@ validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key prepare() { cd "${srcdir}"/${pkgname%-dkms}-${pkgver} + # kernel 5.8 backport from https://github.com/openzfs/zfs/pull/10728 + patch -p1 -i ../d90015c5439167456d02585c25147742453d9aa6.patch + patch -p1 -i ../0001-only-build-the-module-in-dkms.conf.patch # remove unneeded sections from module build -- cgit v1.2.1 From 2c461b9a373a4768e6ce59c057c2be1b492b6405 Mon Sep 17 00:00:00 2001 From: Jonathon Fernyhough Date: Sat, 10 Oct 2020 11:58:40 +0100 Subject: upgpkg: zfs-dkms 0.8.5-1 upstream release --- .SRCINFO | 21 +++++++++------------ PKGBUILD | 14 ++++---------- 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 6dbe266..04dc6c0 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,31 +1,28 @@ pkgbase = zfs-dkms pkgdesc = Kernel modules for the Zettabyte File System. - pkgver = 0.8.4 - pkgrel = 2 + pkgver = 0.8.5 + pkgrel = 1 url = https://zfsonlinux.org/ arch = any license = CDDL - provides = ZFS-MODULE=0.8.4 - provides = SPL-MODULE=0.8.4 + provides = ZFS-MODULE=0.8.5 + provides = SPL-MODULE=0.8.5 provides = spl-dkms provides = zfs conflicts = spl-dkms replaces = spl-dkms - 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 = https://github.com/openzfs/zfs/commit/d90015c5439167456d02585c25147742453d9aa6.patch + source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.5/zfs-0.8.5.tar.gz + source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.5/zfs-0.8.5.tar.gz.asc source = 0001-only-build-the-module-in-dkms.conf.patch validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027 validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B - sha256sums = 2b988f5777976f09d08083f6bebf6e67219c4c4c183c1f33033fb7e5e5eacafb + sha256sums = dbb41d6b9c606a34ac93f4c19069fd6806ceeacb558f834f8a70755dadb7cd3d sha256sums = SKIP - sha256sums = e801bb4e820924b69289785976b280084b5b7d3bb2e9f9cc1a08710d6e5d898b sha256sums = 780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409 - b2sums = 776bcd6dfab8825c07d315085e288b29bf543d6957325d5d566b7b78c04505dde9bd25eb6684cb4a1b6a657de8a4e1290d04d2b9079d26d6b834a70f1ec3b569 + b2sums = 8376f360369c4657ff1fc040fb2bba780bbd5d6a98d149d2fa4ba39478588e213dbf6db218c7bd970839f015a69ae00ac951b90afc1c26b34aadf666b2976cab b2sums = SKIP - b2sums = 5375c5344ea88f6d2b1a4f9cf9c1efeae67a53ef487fe3962790f32d9dcff2622dd22f8f8b0f83b648fe1f490bd2e12e91f5d5fbfca274e1ec72aaa8f6c5e335 b2sums = 1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50 pkgname = zfs-dkms - depends = zfs-utils=0.8.4 + depends = zfs-utils=0.8.5 depends = dkms diff --git a/PKGBUILD b/PKGBUILD index 4254167..86142c1 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,8 +4,8 @@ # All my PKGBUILDs are managed at https://github.com/eli-schwartz/pkgbuilds pkgname=zfs-dkms -pkgver=0.8.4 -pkgrel=2 +pkgver=0.8.5 +pkgrel=1 pkgdesc="Kernel modules for the Zettabyte File System." arch=('any') url="https://zfsonlinux.org/" @@ -16,15 +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/d90015c5439167456d02585c25147742453d9aa6.patch" "0001-only-build-the-module-in-dkms.conf.patch") -sha256sums=('2b988f5777976f09d08083f6bebf6e67219c4c4c183c1f33033fb7e5e5eacafb' +sha256sums=('dbb41d6b9c606a34ac93f4c19069fd6806ceeacb558f834f8a70755dadb7cd3d' 'SKIP' - 'e801bb4e820924b69289785976b280084b5b7d3bb2e9f9cc1a08710d6e5d898b' '780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409') -b2sums=('776bcd6dfab8825c07d315085e288b29bf543d6957325d5d566b7b78c04505dde9bd25eb6684cb4a1b6a657de8a4e1290d04d2b9079d26d6b834a70f1ec3b569' +b2sums=('8376f360369c4657ff1fc040fb2bba780bbd5d6a98d149d2fa4ba39478588e213dbf6db218c7bd970839f015a69ae00ac951b90afc1c26b34aadf666b2976cab' 'SKIP' - '5375c5344ea88f6d2b1a4f9cf9c1efeae67a53ef487fe3962790f32d9dcff2622dd22f8f8b0f83b648fe1f490bd2e12e91f5d5fbfca274e1ec72aaa8f6c5e335' '1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50') validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) 'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf @@ -32,9 +29,6 @@ validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key prepare() { cd "${srcdir}"/${pkgname%-dkms}-${pkgver} - # kernel 5.8 backport from https://github.com/openzfs/zfs/pull/10728 - patch -p1 -i ../d90015c5439167456d02585c25147742453d9aa6.patch - patch -p1 -i ../0001-only-build-the-module-in-dkms.conf.patch # remove unneeded sections from module build -- cgit v1.2.1 From 6eda5c2424ba977abeff8af2fe4aa7897bd8e48a Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Wed, 9 Dec 2020 02:06:41 -0500 Subject: upgpkg: zfs-dkms 2.0.0-1 upstream release --- .SRCINFO | 16 ++++++++-------- PKGBUILD | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 04dc6c0..4dccbcf 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,28 +1,28 @@ pkgbase = zfs-dkms pkgdesc = Kernel modules for the Zettabyte File System. - pkgver = 0.8.5 + pkgver = 2.0.0 pkgrel = 1 url = https://zfsonlinux.org/ arch = any license = CDDL - provides = ZFS-MODULE=0.8.5 - provides = SPL-MODULE=0.8.5 + provides = ZFS-MODULE=2.0.0 + provides = SPL-MODULE=2.0.0 provides = spl-dkms provides = zfs conflicts = spl-dkms replaces = spl-dkms - source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.5/zfs-0.8.5.tar.gz - source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.5/zfs-0.8.5.tar.gz.asc + source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.0.0/zfs-2.0.0.tar.gz + source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.0.0/zfs-2.0.0.tar.gz.asc source = 0001-only-build-the-module-in-dkms.conf.patch validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027 validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B - sha256sums = dbb41d6b9c606a34ac93f4c19069fd6806ceeacb558f834f8a70755dadb7cd3d + sha256sums = 3403bf8e993f3c9d772f768142117df47bdbbb8e9bbf85a29c0e166f577f9311 sha256sums = SKIP sha256sums = 780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409 - b2sums = 8376f360369c4657ff1fc040fb2bba780bbd5d6a98d149d2fa4ba39478588e213dbf6db218c7bd970839f015a69ae00ac951b90afc1c26b34aadf666b2976cab + b2sums = 2961b97aa6736af9b4a2bc968d1488f49ec0c0fd7bb22b6bc015047239279efd2d48f8d7c593f9b467ac9d40f99d67363ab551bdfaf1dd71335c37c48c759875 b2sums = SKIP b2sums = 1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50 pkgname = zfs-dkms - depends = zfs-utils=0.8.5 + depends = zfs-utils=2.0.0 depends = dkms diff --git a/PKGBUILD b/PKGBUILD index 86142c1..1d0732c 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # All my PKGBUILDs are managed at https://github.com/eli-schwartz/pkgbuilds pkgname=zfs-dkms -pkgver=0.8.5 +pkgver=2.0.0 pkgrel=1 pkgdesc="Kernel modules for the Zettabyte File System." arch=('any') @@ -17,10 +17,10 @@ provides+=('zfs') replaces=('spl-dkms') source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc} "0001-only-build-the-module-in-dkms.conf.patch") -sha256sums=('dbb41d6b9c606a34ac93f4c19069fd6806ceeacb558f834f8a70755dadb7cd3d' +sha256sums=('3403bf8e993f3c9d772f768142117df47bdbbb8e9bbf85a29c0e166f577f9311' 'SKIP' '780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409') -b2sums=('8376f360369c4657ff1fc040fb2bba780bbd5d6a98d149d2fa4ba39478588e213dbf6db218c7bd970839f015a69ae00ac951b90afc1c26b34aadf666b2976cab' +b2sums=('2961b97aa6736af9b4a2bc968d1488f49ec0c0fd7bb22b6bc015047239279efd2d48f8d7c593f9b467ac9d40f99d67363ab551bdfaf1dd71335c37c48c759875' 'SKIP' '1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50') validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) -- cgit v1.2.1 From 3cc851afa84da55e9d121ea844213a9b4a018c80 Mon Sep 17 00:00:00 2001 From: Jonathon Fernyhough Date: Wed, 3 Feb 2021 12:19:02 +0000 Subject: OpenZFS 2.0.2. zfs-dkms adds config/compile (required by new versions of autoconf). Signed-off-by: Eli Schwartz --- .SRCINFO | 16 ++++++++-------- PKGBUILD | 8 ++++---- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 4dccbcf..5f7639a 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,28 +1,28 @@ pkgbase = zfs-dkms pkgdesc = Kernel modules for the Zettabyte File System. - pkgver = 2.0.0 + pkgver = 2.0.2 pkgrel = 1 url = https://zfsonlinux.org/ arch = any license = CDDL - provides = ZFS-MODULE=2.0.0 - provides = SPL-MODULE=2.0.0 + provides = ZFS-MODULE=2.0.2 + provides = SPL-MODULE=2.0.2 provides = spl-dkms provides = zfs conflicts = spl-dkms replaces = spl-dkms - source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.0.0/zfs-2.0.0.tar.gz - source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.0.0/zfs-2.0.0.tar.gz.asc + source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.0.2/zfs-2.0.2.tar.gz + source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.0.2/zfs-2.0.2.tar.gz.asc source = 0001-only-build-the-module-in-dkms.conf.patch validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027 validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B - sha256sums = 3403bf8e993f3c9d772f768142117df47bdbbb8e9bbf85a29c0e166f577f9311 + sha256sums = bde5067ce4577d26cc0f0313a09173ad40d590d01539b92c93f33f06ee150b24 sha256sums = SKIP sha256sums = 780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409 - b2sums = 2961b97aa6736af9b4a2bc968d1488f49ec0c0fd7bb22b6bc015047239279efd2d48f8d7c593f9b467ac9d40f99d67363ab551bdfaf1dd71335c37c48c759875 + b2sums = 34f4168365d36372349a4986f17cff64987a697e445c2de2ff0bf5d218725fad4aab12b0436ca816300a65856f5918f0cdb8931abeeacd894046daf013bb944f b2sums = SKIP b2sums = 1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50 pkgname = zfs-dkms - depends = zfs-utils=2.0.0 + depends = zfs-utils=2.0.2 depends = dkms diff --git a/PKGBUILD b/PKGBUILD index 1d0732c..9917e93 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # All my PKGBUILDs are managed at https://github.com/eli-schwartz/pkgbuilds pkgname=zfs-dkms -pkgver=2.0.0 +pkgver=2.0.2 pkgrel=1 pkgdesc="Kernel modules for the Zettabyte File System." arch=('any') @@ -17,10 +17,10 @@ provides+=('zfs') replaces=('spl-dkms') source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc} "0001-only-build-the-module-in-dkms.conf.patch") -sha256sums=('3403bf8e993f3c9d772f768142117df47bdbbb8e9bbf85a29c0e166f577f9311' +sha256sums=('bde5067ce4577d26cc0f0313a09173ad40d590d01539b92c93f33f06ee150b24' 'SKIP' '780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409') -b2sums=('2961b97aa6736af9b4a2bc968d1488f49ec0c0fd7bb22b6bc015047239279efd2d48f8d7c593f9b467ac9d40f99d67363ab551bdfaf1dd71335c37c48c759875' +b2sums=('34f4168365d36372349a4986f17cff64987a697e445c2de2ff0bf5d218725fad4aab12b0436ca816300a65856f5918f0cdb8931abeeacd894046daf013bb944f' 'SKIP' '1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50') validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) @@ -55,6 +55,6 @@ package() { dkmsdir="${pkgdir}/usr/src/${pkgname%-dkms}-${pkgver}" install -d "${dkmsdir}"/{config,scripts} cp -a configure dkms.conf Makefile.in META ${pkgname%-dkms}_config.h.in ${pkgname%-dkms}.release.in include/ module/ "${dkmsdir}"/ - cp config/config.* config/missing config/*sh "${dkmsdir}"/config/ + cp config/compile config/config.* config/missing config/*sh "${dkmsdir}"/config/ cp scripts/enum-extract.pl scripts/dkms.postbuild "${dkmsdir}"/scripts/ } -- cgit v1.2.1 From ede6f778d8e48e81900e583e872bee4493608644 Mon Sep 17 00:00:00 2001 From: Jonathon Fernyhough Date: Fri, 12 Feb 2021 01:46:12 +0000 Subject: OpenZFS 2.0.3 --- .SRCINFO | 16 ++++++++-------- PKGBUILD | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 5f7639a..8fc2bc0 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,28 +1,28 @@ pkgbase = zfs-dkms pkgdesc = Kernel modules for the Zettabyte File System. - pkgver = 2.0.2 + pkgver = 2.0.3 pkgrel = 1 url = https://zfsonlinux.org/ arch = any license = CDDL - provides = ZFS-MODULE=2.0.2 - provides = SPL-MODULE=2.0.2 + provides = ZFS-MODULE=2.0.3 + provides = SPL-MODULE=2.0.3 provides = spl-dkms provides = zfs conflicts = spl-dkms replaces = spl-dkms - source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.0.2/zfs-2.0.2.tar.gz - source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.0.2/zfs-2.0.2.tar.gz.asc + source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.0.3/zfs-2.0.3.tar.gz + source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.0.3/zfs-2.0.3.tar.gz.asc source = 0001-only-build-the-module-in-dkms.conf.patch validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027 validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B - sha256sums = bde5067ce4577d26cc0f0313a09173ad40d590d01539b92c93f33f06ee150b24 + sha256sums = 0694f64aa76a3a0a506e20e99b49102c3cb68bef63cb0f0154e50befc387e539 sha256sums = SKIP sha256sums = 780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409 - b2sums = 34f4168365d36372349a4986f17cff64987a697e445c2de2ff0bf5d218725fad4aab12b0436ca816300a65856f5918f0cdb8931abeeacd894046daf013bb944f + b2sums = 71b3f68e681d51a78a38f9e11012074d2a4483b68437a17b5766d5db557be6fc8080179f20c1abc60f61b983eb0f126b887d762dc9aa8e480a3ee311d9067bf5 b2sums = SKIP b2sums = 1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50 pkgname = zfs-dkms - depends = zfs-utils=2.0.2 + depends = zfs-utils=2.0.3 depends = dkms diff --git a/PKGBUILD b/PKGBUILD index 9917e93..d39cd4f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # All my PKGBUILDs are managed at https://github.com/eli-schwartz/pkgbuilds pkgname=zfs-dkms -pkgver=2.0.2 +pkgver=2.0.3 pkgrel=1 pkgdesc="Kernel modules for the Zettabyte File System." arch=('any') @@ -17,10 +17,10 @@ provides+=('zfs') replaces=('spl-dkms') source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc} "0001-only-build-the-module-in-dkms.conf.patch") -sha256sums=('bde5067ce4577d26cc0f0313a09173ad40d590d01539b92c93f33f06ee150b24' +sha256sums=('0694f64aa76a3a0a506e20e99b49102c3cb68bef63cb0f0154e50befc387e539' 'SKIP' '780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409') -b2sums=('34f4168365d36372349a4986f17cff64987a697e445c2de2ff0bf5d218725fad4aab12b0436ca816300a65856f5918f0cdb8931abeeacd894046daf013bb944f' +b2sums=('71b3f68e681d51a78a38f9e11012074d2a4483b68437a17b5766d5db557be6fc8080179f20c1abc60f61b983eb0f126b887d762dc9aa8e480a3ee311d9067bf5' 'SKIP' '1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50') validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) -- cgit v1.2.1 From 33ee9ce979d2fb5887dbc6c7b733ba7e8dc56801 Mon Sep 17 00:00:00 2001 From: Jonathon Fernyhough Date: Wed, 10 Mar 2021 13:41:50 +0000 Subject: zfs-utils/zfs-dkms: upstream 2.0.4 --- .SRCINFO | 16 ++++++++-------- PKGBUILD | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 8fc2bc0..0d613c6 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,28 +1,28 @@ pkgbase = zfs-dkms pkgdesc = Kernel modules for the Zettabyte File System. - pkgver = 2.0.3 + pkgver = 2.0.4 pkgrel = 1 url = https://zfsonlinux.org/ arch = any license = CDDL - provides = ZFS-MODULE=2.0.3 - provides = SPL-MODULE=2.0.3 + provides = ZFS-MODULE=2.0.4 + provides = SPL-MODULE=2.0.4 provides = spl-dkms provides = zfs conflicts = spl-dkms replaces = spl-dkms - source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.0.3/zfs-2.0.3.tar.gz - source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.0.3/zfs-2.0.3.tar.gz.asc + source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.0.4/zfs-2.0.4.tar.gz + source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.0.4/zfs-2.0.4.tar.gz.asc source = 0001-only-build-the-module-in-dkms.conf.patch validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027 validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B - sha256sums = 0694f64aa76a3a0a506e20e99b49102c3cb68bef63cb0f0154e50befc387e539 + sha256sums = 7d1344c5433b91823f02c2e40b33d181fa6faf286bea5591f4b1965f23d45f6c sha256sums = SKIP sha256sums = 780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409 - b2sums = 71b3f68e681d51a78a38f9e11012074d2a4483b68437a17b5766d5db557be6fc8080179f20c1abc60f61b983eb0f126b887d762dc9aa8e480a3ee311d9067bf5 + b2sums = 7e4780092c0a87d5d187cd5734ddc736574db80b500f155287640ef2230e09335cc9b6b26ec1b7d8ab1b7942673ea49a3007a81da372a6d2ac36f3908913045c b2sums = SKIP b2sums = 1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50 pkgname = zfs-dkms - depends = zfs-utils=2.0.3 + depends = zfs-utils=2.0.4 depends = dkms diff --git a/PKGBUILD b/PKGBUILD index d39cd4f..5592264 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # All my PKGBUILDs are managed at https://github.com/eli-schwartz/pkgbuilds pkgname=zfs-dkms -pkgver=2.0.3 +pkgver=2.0.4 pkgrel=1 pkgdesc="Kernel modules for the Zettabyte File System." arch=('any') @@ -17,10 +17,10 @@ provides+=('zfs') replaces=('spl-dkms') source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc} "0001-only-build-the-module-in-dkms.conf.patch") -sha256sums=('0694f64aa76a3a0a506e20e99b49102c3cb68bef63cb0f0154e50befc387e539' +sha256sums=('7d1344c5433b91823f02c2e40b33d181fa6faf286bea5591f4b1965f23d45f6c' 'SKIP' '780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409') -b2sums=('71b3f68e681d51a78a38f9e11012074d2a4483b68437a17b5766d5db557be6fc8080179f20c1abc60f61b983eb0f126b887d762dc9aa8e480a3ee311d9067bf5' +b2sums=('7e4780092c0a87d5d187cd5734ddc736574db80b500f155287640ef2230e09335cc9b6b26ec1b7d8ab1b7942673ea49a3007a81da372a6d2ac36f3908913045c' 'SKIP' '1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50') validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) -- cgit v1.2.1 From 6b6812f38ff6c8194134c1cd3266e5dedc5f4b4d Mon Sep 17 00:00:00 2001 From: Jonathon Fernyhough Date: Tue, 27 Apr 2021 12:42:31 +0100 Subject: upgpkg: zfs-dkms 2.0.4-2 Backport kernel 5.12 compat and update patches This backports the upstream compat patches https://github.com/openzfs/zfs/commit/e2a8296131e94ad785f5564156ed2db1fdb2e080 and https://github.com/openzfs/zfs/commit/ffd6978ef59cfe2773e984bf03de2f0b93b03f5c via https://github.com/openzfs/zfs/pull/12009 Signed-off-by: Eli Schwartz --- .SRCINFO | 8 +++++++- PKGBUILD | 12 +++++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 0d613c6..2ffb8bd 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = zfs-dkms pkgdesc = Kernel modules for the Zettabyte File System. pkgver = 2.0.4 - pkgrel = 1 + pkgrel = 2 url = https://zfsonlinux.org/ arch = any license = CDDL @@ -13,14 +13,20 @@ pkgbase = zfs-dkms replaces = spl-dkms source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.0.4/zfs-2.0.4.tar.gz source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.0.4/zfs-2.0.4.tar.gz.asc + source = https://github.com/openzfs/zfs/pull/12009/commits/938a7a375b2c18fef621fb30d71bec0c19e94142.patch + source = https://github.com/openzfs/zfs/pull/12009/commits/8122746cc52741e2d010aa0ad8e0f15ab24bbf28.patch source = 0001-only-build-the-module-in-dkms.conf.patch validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027 validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B sha256sums = 7d1344c5433b91823f02c2e40b33d181fa6faf286bea5591f4b1965f23d45f6c sha256sums = SKIP + sha256sums = 6650bcaf8c1ebe23a0f749feeaf316b75148a76549129deba5f65d4555b2b874 + sha256sums = 61595dd8b1e3fa4c7ca61a67a6960135ee11710d80f9fe6bec7071acece84028 sha256sums = 780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409 b2sums = 7e4780092c0a87d5d187cd5734ddc736574db80b500f155287640ef2230e09335cc9b6b26ec1b7d8ab1b7942673ea49a3007a81da372a6d2ac36f3908913045c b2sums = SKIP + b2sums = 195fe600d859ac6832891b5c938b2d55e22cfbbf8da56772e884d436ace9b48c8571015d1440884efc1e531294e8ef95ce45d69a22a93ef62e1016e497856a3f + b2sums = d6e67e037375dc99a3caacec257901c5678b08e42fa2158ce8d8bd0b93d47b9bd69b95042bac7a58bf987c155107fe80c93b57c0cd38e4065dbac24ac409cc54 b2sums = 1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50 pkgname = zfs-dkms diff --git a/PKGBUILD b/PKGBUILD index 5592264..eb2ca3d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,7 +5,7 @@ pkgname=zfs-dkms pkgver=2.0.4 -pkgrel=1 +pkgrel=2 pkgdesc="Kernel modules for the Zettabyte File System." arch=('any') url="https://zfsonlinux.org/" @@ -16,12 +16,18 @@ 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/pull/12009/commits/938a7a375b2c18fef621fb30d71bec0c19e94142.patch" + "https://github.com/openzfs/zfs/pull/12009/commits/8122746cc52741e2d010aa0ad8e0f15ab24bbf28.patch" "0001-only-build-the-module-in-dkms.conf.patch") sha256sums=('7d1344c5433b91823f02c2e40b33d181fa6faf286bea5591f4b1965f23d45f6c' 'SKIP' + '6650bcaf8c1ebe23a0f749feeaf316b75148a76549129deba5f65d4555b2b874' + '61595dd8b1e3fa4c7ca61a67a6960135ee11710d80f9fe6bec7071acece84028' '780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409') b2sums=('7e4780092c0a87d5d187cd5734ddc736574db80b500f155287640ef2230e09335cc9b6b26ec1b7d8ab1b7942673ea49a3007a81da372a6d2ac36f3908913045c' 'SKIP' + '195fe600d859ac6832891b5c938b2d55e22cfbbf8da56772e884d436ace9b48c8571015d1440884efc1e531294e8ef95ce45d69a22a93ef62e1016e497856a3f' + 'd6e67e037375dc99a3caacec257901c5678b08e42fa2158ce8d8bd0b93d47b9bd69b95042bac7a58bf987c155107fe80c93b57c0cd38e4065dbac24ac409cc54' '1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50') validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) 'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf @@ -31,6 +37,10 @@ prepare() { patch -p1 -i ../0001-only-build-the-module-in-dkms.conf.patch + # Kernel 5.12 compat, https://github.com/openzfs/zfs/pull/12009 + patch -p1 -i ../938a7a375b2c18fef621fb30d71bec0c19e94142.patch + patch -p1 -i ../8122746cc52741e2d010aa0ad8e0f15ab24bbf28.patch + # remove unneeded sections from module build sed -ri "/AC_CONFIG_FILES/,/]\)/{ /AC_CONFIG_FILES/n -- cgit v1.2.1 From aa6bf94adf76cd1ee034fc8bc0b4142e569eb202 Mon Sep 17 00:00:00 2001 From: Jonathon Fernyhough Date: Tue, 1 Jun 2021 20:55:50 +0100 Subject: upgpkg: zfs-dkms 2.0.4-3 kernel 5.12 backports This includes a number of backports for the zfs-2.0.5-staging branch and switches compat patches from 12009 to the merged commits. Signed-off-by: Eli Schwartz --- .SRCINFO | 26 +++++++++++++++++++------- PKGBUILD | 40 +++++++++++++++++++++++++++++++--------- 2 files changed, 50 insertions(+), 16 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 2ffb8bd..d594a26 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = zfs-dkms pkgdesc = Kernel modules for the Zettabyte File System. pkgver = 2.0.4 - pkgrel = 2 + pkgrel = 3 url = https://zfsonlinux.org/ arch = any license = CDDL @@ -13,20 +13,32 @@ pkgbase = zfs-dkms replaces = spl-dkms source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.0.4/zfs-2.0.4.tar.gz source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.0.4/zfs-2.0.4.tar.gz.asc - source = https://github.com/openzfs/zfs/pull/12009/commits/938a7a375b2c18fef621fb30d71bec0c19e94142.patch - source = https://github.com/openzfs/zfs/pull/12009/commits/8122746cc52741e2d010aa0ad8e0f15ab24bbf28.patch + source = https://github.com/openzfs/zfs/commit/f315d9a3ff3cc0b81c99dd9be5878a55d2e98d8e.patch + source = https://github.com/openzfs/zfs/commit/77352db228c07ce8ba50478b9029820ca69c6c1b.patch + source = https://github.com/openzfs/zfs/commit/6eced028dbbc2a44e32c4c0a76234ac2da9a365a.patch + source = https://github.com/openzfs/zfs/commit/b3f8b103cb3a4bbb7ad41f6faf630be7baa4f585.patch + source = https://github.com/openzfs/zfs/commit/ee2a9d2c771657168652e058477b81389c662b5e.patch + source = https://github.com/openzfs/zfs/commit/3e0bc63e1b0ca03493b936e92e871ca7ae451a0a.patch source = 0001-only-build-the-module-in-dkms.conf.patch validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027 validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B sha256sums = 7d1344c5433b91823f02c2e40b33d181fa6faf286bea5591f4b1965f23d45f6c sha256sums = SKIP - sha256sums = 6650bcaf8c1ebe23a0f749feeaf316b75148a76549129deba5f65d4555b2b874 - sha256sums = 61595dd8b1e3fa4c7ca61a67a6960135ee11710d80f9fe6bec7071acece84028 + sha256sums = f91835f187f5210fd855ee929b8f893771874a456db2bee685f71c833c696db8 + sha256sums = d44e6e7b6a6aa5dc4422127f23524f315463fb9c042a519817b4f9cba5c483d1 + sha256sums = d07813f7e8427956cd9ae814540bca7a8d4638f1dbdea2fefc9c73bf2f553ba8 + sha256sums = 5940e29e428e74df8ca4ed924259e86cef57226680f27675944d3fdcce9d8604 + sha256sums = 9091d65ec611119778daa167177f6a634a8f4cd9fa4b0e819de32a60ea0137fc + sha256sums = 0b705a23f748b98a5d789d32aedd342ed61378f0b1c65539d8c6df510c587050 sha256sums = 780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409 b2sums = 7e4780092c0a87d5d187cd5734ddc736574db80b500f155287640ef2230e09335cc9b6b26ec1b7d8ab1b7942673ea49a3007a81da372a6d2ac36f3908913045c b2sums = SKIP - b2sums = 195fe600d859ac6832891b5c938b2d55e22cfbbf8da56772e884d436ace9b48c8571015d1440884efc1e531294e8ef95ce45d69a22a93ef62e1016e497856a3f - b2sums = d6e67e037375dc99a3caacec257901c5678b08e42fa2158ce8d8bd0b93d47b9bd69b95042bac7a58bf987c155107fe80c93b57c0cd38e4065dbac24ac409cc54 + b2sums = 49724351c5a8e6ffa66762d5aac84ad89a3d04022d086d9f37ccd616b3e8e95852197b5333bdeeeab54fc51516d8254d0138a4422cc66214bb602e5ed72bbabf + b2sums = cfe0d17448f25ec649ca7cf0bb7ee4f2685d09b2fa693b411f31a4035e113627c8be73514b39f2460646b9a556a133afcbfc803675d93d1fd5d93d64d8b4e7b2 + b2sums = b1012123a6d9ddd03b7db83075447eba99c8fb4e3bf4f4e8a54d9defe2c4e6b752bda70d8512a8da68f509fc832acbaf2eb73c6673123553ac38c99095d7f872 + b2sums = 556d3850a2c7f74370702ad354f64424170682f6499b6a5e1a58c45e20ddb082109a541b8613b815820569aeab5c322e180d8f0d0a6cea4799e11dd9afbe464e + b2sums = 4454568cfcafa9b6b7ba6de94df728da349f1dff9803c21fc4d9613af17b65dc59ba2c7cf9584d1456cf454e4ba1bf9a9467e0b181d097861d649ffd32461bf4 + b2sums = c32c94c233cc15f1db4166d293b7e0030f51c9ba6ba185293a2c068419a64c46288244e6096f69f55e5bd19006729b080cb95966519eb8db142a494d9f147878 b2sums = 1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50 pkgname = zfs-dkms diff --git a/PKGBUILD b/PKGBUILD index eb2ca3d..ec21a2f 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,7 +5,7 @@ pkgname=zfs-dkms pkgver=2.0.4 -pkgrel=2 +pkgrel=3 pkgdesc="Kernel modules for the Zettabyte File System." arch=('any') url="https://zfsonlinux.org/" @@ -16,18 +16,30 @@ 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/pull/12009/commits/938a7a375b2c18fef621fb30d71bec0c19e94142.patch" - "https://github.com/openzfs/zfs/pull/12009/commits/8122746cc52741e2d010aa0ad8e0f15ab24bbf28.patch" + "https://github.com/openzfs/zfs/commit/f315d9a3ff3cc0b81c99dd9be5878a55d2e98d8e.patch" + "https://github.com/openzfs/zfs/commit/77352db228c07ce8ba50478b9029820ca69c6c1b.patch" + "https://github.com/openzfs/zfs/commit/6eced028dbbc2a44e32c4c0a76234ac2da9a365a.patch" + "https://github.com/openzfs/zfs/commit/b3f8b103cb3a4bbb7ad41f6faf630be7baa4f585.patch" + "https://github.com/openzfs/zfs/commit/ee2a9d2c771657168652e058477b81389c662b5e.patch" + "https://github.com/openzfs/zfs/commit/3e0bc63e1b0ca03493b936e92e871ca7ae451a0a.patch" "0001-only-build-the-module-in-dkms.conf.patch") sha256sums=('7d1344c5433b91823f02c2e40b33d181fa6faf286bea5591f4b1965f23d45f6c' 'SKIP' - '6650bcaf8c1ebe23a0f749feeaf316b75148a76549129deba5f65d4555b2b874' - '61595dd8b1e3fa4c7ca61a67a6960135ee11710d80f9fe6bec7071acece84028' + 'f91835f187f5210fd855ee929b8f893771874a456db2bee685f71c833c696db8' + 'd44e6e7b6a6aa5dc4422127f23524f315463fb9c042a519817b4f9cba5c483d1' + 'd07813f7e8427956cd9ae814540bca7a8d4638f1dbdea2fefc9c73bf2f553ba8' + '5940e29e428e74df8ca4ed924259e86cef57226680f27675944d3fdcce9d8604' + '9091d65ec611119778daa167177f6a634a8f4cd9fa4b0e819de32a60ea0137fc' + '0b705a23f748b98a5d789d32aedd342ed61378f0b1c65539d8c6df510c587050' '780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409') b2sums=('7e4780092c0a87d5d187cd5734ddc736574db80b500f155287640ef2230e09335cc9b6b26ec1b7d8ab1b7942673ea49a3007a81da372a6d2ac36f3908913045c' 'SKIP' - '195fe600d859ac6832891b5c938b2d55e22cfbbf8da56772e884d436ace9b48c8571015d1440884efc1e531294e8ef95ce45d69a22a93ef62e1016e497856a3f' - 'd6e67e037375dc99a3caacec257901c5678b08e42fa2158ce8d8bd0b93d47b9bd69b95042bac7a58bf987c155107fe80c93b57c0cd38e4065dbac24ac409cc54' + '49724351c5a8e6ffa66762d5aac84ad89a3d04022d086d9f37ccd616b3e8e95852197b5333bdeeeab54fc51516d8254d0138a4422cc66214bb602e5ed72bbabf' + 'cfe0d17448f25ec649ca7cf0bb7ee4f2685d09b2fa693b411f31a4035e113627c8be73514b39f2460646b9a556a133afcbfc803675d93d1fd5d93d64d8b4e7b2' + 'b1012123a6d9ddd03b7db83075447eba99c8fb4e3bf4f4e8a54d9defe2c4e6b752bda70d8512a8da68f509fc832acbaf2eb73c6673123553ac38c99095d7f872' + '556d3850a2c7f74370702ad354f64424170682f6499b6a5e1a58c45e20ddb082109a541b8613b815820569aeab5c322e180d8f0d0a6cea4799e11dd9afbe464e' + '4454568cfcafa9b6b7ba6de94df728da349f1dff9803c21fc4d9613af17b65dc59ba2c7cf9584d1456cf454e4ba1bf9a9467e0b181d097861d649ffd32461bf4' + 'c32c94c233cc15f1db4166d293b7e0030f51c9ba6ba185293a2c068419a64c46288244e6096f69f55e5bd19006729b080cb95966519eb8db142a494d9f147878' '1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50') validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) 'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf @@ -38,8 +50,18 @@ prepare() { patch -p1 -i ../0001-only-build-the-module-in-dkms.conf.patch # Kernel 5.12 compat, https://github.com/openzfs/zfs/pull/12009 - patch -p1 -i ../938a7a375b2c18fef621fb30d71bec0c19e94142.patch - patch -p1 -i ../8122746cc52741e2d010aa0ad8e0f15ab24bbf28.patch + patch -p1 -i ../f315d9a3ff3cc0b81c99dd9be5878a55d2e98d8e.patch + patch -p1 -i ../77352db228c07ce8ba50478b9029820ca69c6c1b.patch + + # Kernel 5.12 backport "fixes for tmpiles and userns changes", https://github.com/openzfs/zfs/pull/12139 + patch -p1 -i ../6eced028dbbc2a44e32c4c0a76234ac2da9a365a.patch + patch -p1 -i ../b3f8b103cb3a4bbb7ad41f6faf630be7baa4f585.patch + + # Kernel 5.12 backport "Fix dmu_recv_stream test for resumable", https://github.com/openzfs/zfs/pull/12141 + patch -p1 -i ../ee2a9d2c771657168652e058477b81389c662b5e.patch + + # Bugfix backport, "Remove iov_iter_advance() for iter_write", https://github.com/openzfs/zfs/pull/12178 + patch -p1 -i ../3e0bc63e1b0ca03493b936e92e871ca7ae451a0a.patch # remove unneeded sections from module build sed -ri "/AC_CONFIG_FILES/,/]\)/{ -- cgit v1.2.1 From dc3bf71065533e582fba1c72944e24b5cf2033c7 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Wed, 23 Jun 2021 18:25:39 -0400 Subject: ZFS 2.0.5: upstream release --- .SRCINFO | 36 +++++++++--------------------------- PKGBUILD | 40 ++++------------------------------------ 2 files changed, 13 insertions(+), 63 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index d594a26..5903f51 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,46 +1,28 @@ pkgbase = zfs-dkms pkgdesc = Kernel modules for the Zettabyte File System. - pkgver = 2.0.4 - pkgrel = 3 + pkgver = 2.0.5 + pkgrel = 1 url = https://zfsonlinux.org/ arch = any license = CDDL - provides = ZFS-MODULE=2.0.4 - provides = SPL-MODULE=2.0.4 + provides = ZFS-MODULE=2.0.5 + provides = SPL-MODULE=2.0.5 provides = spl-dkms provides = zfs conflicts = spl-dkms replaces = spl-dkms - source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.0.4/zfs-2.0.4.tar.gz - source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.0.4/zfs-2.0.4.tar.gz.asc - source = https://github.com/openzfs/zfs/commit/f315d9a3ff3cc0b81c99dd9be5878a55d2e98d8e.patch - source = https://github.com/openzfs/zfs/commit/77352db228c07ce8ba50478b9029820ca69c6c1b.patch - source = https://github.com/openzfs/zfs/commit/6eced028dbbc2a44e32c4c0a76234ac2da9a365a.patch - source = https://github.com/openzfs/zfs/commit/b3f8b103cb3a4bbb7ad41f6faf630be7baa4f585.patch - source = https://github.com/openzfs/zfs/commit/ee2a9d2c771657168652e058477b81389c662b5e.patch - source = https://github.com/openzfs/zfs/commit/3e0bc63e1b0ca03493b936e92e871ca7ae451a0a.patch + source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.0.5/zfs-2.0.5.tar.gz + source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.0.5/zfs-2.0.5.tar.gz.asc source = 0001-only-build-the-module-in-dkms.conf.patch validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027 validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B - sha256sums = 7d1344c5433b91823f02c2e40b33d181fa6faf286bea5591f4b1965f23d45f6c + sha256sums = 3a17498d704ebf4c5d7231660f6fb44ae07a1545519f567452a4270851a86ec9 sha256sums = SKIP - sha256sums = f91835f187f5210fd855ee929b8f893771874a456db2bee685f71c833c696db8 - sha256sums = d44e6e7b6a6aa5dc4422127f23524f315463fb9c042a519817b4f9cba5c483d1 - sha256sums = d07813f7e8427956cd9ae814540bca7a8d4638f1dbdea2fefc9c73bf2f553ba8 - sha256sums = 5940e29e428e74df8ca4ed924259e86cef57226680f27675944d3fdcce9d8604 - sha256sums = 9091d65ec611119778daa167177f6a634a8f4cd9fa4b0e819de32a60ea0137fc - sha256sums = 0b705a23f748b98a5d789d32aedd342ed61378f0b1c65539d8c6df510c587050 sha256sums = 780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409 - b2sums = 7e4780092c0a87d5d187cd5734ddc736574db80b500f155287640ef2230e09335cc9b6b26ec1b7d8ab1b7942673ea49a3007a81da372a6d2ac36f3908913045c + b2sums = 4505c43a3b9a6c2b925383d00bbd9f17505290ded83f9bd3f08211769fa39254742340bdda65efd53f87f1708138517f91f8a43c01f3ce4191de200c84c77754 b2sums = SKIP - b2sums = 49724351c5a8e6ffa66762d5aac84ad89a3d04022d086d9f37ccd616b3e8e95852197b5333bdeeeab54fc51516d8254d0138a4422cc66214bb602e5ed72bbabf - b2sums = cfe0d17448f25ec649ca7cf0bb7ee4f2685d09b2fa693b411f31a4035e113627c8be73514b39f2460646b9a556a133afcbfc803675d93d1fd5d93d64d8b4e7b2 - b2sums = b1012123a6d9ddd03b7db83075447eba99c8fb4e3bf4f4e8a54d9defe2c4e6b752bda70d8512a8da68f509fc832acbaf2eb73c6673123553ac38c99095d7f872 - b2sums = 556d3850a2c7f74370702ad354f64424170682f6499b6a5e1a58c45e20ddb082109a541b8613b815820569aeab5c322e180d8f0d0a6cea4799e11dd9afbe464e - b2sums = 4454568cfcafa9b6b7ba6de94df728da349f1dff9803c21fc4d9613af17b65dc59ba2c7cf9584d1456cf454e4ba1bf9a9467e0b181d097861d649ffd32461bf4 - b2sums = c32c94c233cc15f1db4166d293b7e0030f51c9ba6ba185293a2c068419a64c46288244e6096f69f55e5bd19006729b080cb95966519eb8db142a494d9f147878 b2sums = 1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50 pkgname = zfs-dkms - depends = zfs-utils=2.0.4 + depends = zfs-utils=2.0.5 depends = dkms diff --git a/PKGBUILD b/PKGBUILD index ec21a2f..8053076 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,8 +4,8 @@ # All my PKGBUILDs are managed at https://github.com/eli-schwartz/pkgbuilds pkgname=zfs-dkms -pkgver=2.0.4 -pkgrel=3 +pkgver=2.0.5 +pkgrel=1 pkgdesc="Kernel modules for the Zettabyte File System." arch=('any') url="https://zfsonlinux.org/" @@ -16,30 +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/f315d9a3ff3cc0b81c99dd9be5878a55d2e98d8e.patch" - "https://github.com/openzfs/zfs/commit/77352db228c07ce8ba50478b9029820ca69c6c1b.patch" - "https://github.com/openzfs/zfs/commit/6eced028dbbc2a44e32c4c0a76234ac2da9a365a.patch" - "https://github.com/openzfs/zfs/commit/b3f8b103cb3a4bbb7ad41f6faf630be7baa4f585.patch" - "https://github.com/openzfs/zfs/commit/ee2a9d2c771657168652e058477b81389c662b5e.patch" - "https://github.com/openzfs/zfs/commit/3e0bc63e1b0ca03493b936e92e871ca7ae451a0a.patch" "0001-only-build-the-module-in-dkms.conf.patch") -sha256sums=('7d1344c5433b91823f02c2e40b33d181fa6faf286bea5591f4b1965f23d45f6c' +sha256sums=('3a17498d704ebf4c5d7231660f6fb44ae07a1545519f567452a4270851a86ec9' 'SKIP' - 'f91835f187f5210fd855ee929b8f893771874a456db2bee685f71c833c696db8' - 'd44e6e7b6a6aa5dc4422127f23524f315463fb9c042a519817b4f9cba5c483d1' - 'd07813f7e8427956cd9ae814540bca7a8d4638f1dbdea2fefc9c73bf2f553ba8' - '5940e29e428e74df8ca4ed924259e86cef57226680f27675944d3fdcce9d8604' - '9091d65ec611119778daa167177f6a634a8f4cd9fa4b0e819de32a60ea0137fc' - '0b705a23f748b98a5d789d32aedd342ed61378f0b1c65539d8c6df510c587050' '780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409') -b2sums=('7e4780092c0a87d5d187cd5734ddc736574db80b500f155287640ef2230e09335cc9b6b26ec1b7d8ab1b7942673ea49a3007a81da372a6d2ac36f3908913045c' +b2sums=('4505c43a3b9a6c2b925383d00bbd9f17505290ded83f9bd3f08211769fa39254742340bdda65efd53f87f1708138517f91f8a43c01f3ce4191de200c84c77754' 'SKIP' - '49724351c5a8e6ffa66762d5aac84ad89a3d04022d086d9f37ccd616b3e8e95852197b5333bdeeeab54fc51516d8254d0138a4422cc66214bb602e5ed72bbabf' - 'cfe0d17448f25ec649ca7cf0bb7ee4f2685d09b2fa693b411f31a4035e113627c8be73514b39f2460646b9a556a133afcbfc803675d93d1fd5d93d64d8b4e7b2' - 'b1012123a6d9ddd03b7db83075447eba99c8fb4e3bf4f4e8a54d9defe2c4e6b752bda70d8512a8da68f509fc832acbaf2eb73c6673123553ac38c99095d7f872' - '556d3850a2c7f74370702ad354f64424170682f6499b6a5e1a58c45e20ddb082109a541b8613b815820569aeab5c322e180d8f0d0a6cea4799e11dd9afbe464e' - '4454568cfcafa9b6b7ba6de94df728da349f1dff9803c21fc4d9613af17b65dc59ba2c7cf9584d1456cf454e4ba1bf9a9467e0b181d097861d649ffd32461bf4' - 'c32c94c233cc15f1db4166d293b7e0030f51c9ba6ba185293a2c068419a64c46288244e6096f69f55e5bd19006729b080cb95966519eb8db142a494d9f147878' '1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50') validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) 'C33DF142657ED1F7C328A2960AB9E991C6AF658B') # Brian Behlendorf @@ -49,20 +31,6 @@ prepare() { patch -p1 -i ../0001-only-build-the-module-in-dkms.conf.patch - # Kernel 5.12 compat, https://github.com/openzfs/zfs/pull/12009 - patch -p1 -i ../f315d9a3ff3cc0b81c99dd9be5878a55d2e98d8e.patch - patch -p1 -i ../77352db228c07ce8ba50478b9029820ca69c6c1b.patch - - # Kernel 5.12 backport "fixes for tmpiles and userns changes", https://github.com/openzfs/zfs/pull/12139 - patch -p1 -i ../6eced028dbbc2a44e32c4c0a76234ac2da9a365a.patch - patch -p1 -i ../b3f8b103cb3a4bbb7ad41f6faf630be7baa4f585.patch - - # Kernel 5.12 backport "Fix dmu_recv_stream test for resumable", https://github.com/openzfs/zfs/pull/12141 - patch -p1 -i ../ee2a9d2c771657168652e058477b81389c662b5e.patch - - # Bugfix backport, "Remove iov_iter_advance() for iter_write", https://github.com/openzfs/zfs/pull/12178 - patch -p1 -i ../3e0bc63e1b0ca03493b936e92e871ca7ae451a0a.patch - # remove unneeded sections from module build sed -ri "/AC_CONFIG_FILES/,/]\)/{ /AC_CONFIG_FILES/n -- cgit v1.2.1 From 07a81cf45f76c87c920e50a21cfe62697043b5e5 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Fri, 2 Jul 2021 17:29:23 -0400 Subject: ZFS 2.1.0 upstream release --- .SRCINFO | 16 ++++++++-------- PKGBUILD | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 5903f51..91a6342 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,28 +1,28 @@ pkgbase = zfs-dkms pkgdesc = Kernel modules for the Zettabyte File System. - pkgver = 2.0.5 + pkgver = 2.1.0 pkgrel = 1 url = https://zfsonlinux.org/ arch = any license = CDDL - provides = ZFS-MODULE=2.0.5 - provides = SPL-MODULE=2.0.5 + provides = ZFS-MODULE=2.1.0 + provides = SPL-MODULE=2.1.0 provides = spl-dkms provides = zfs conflicts = spl-dkms replaces = spl-dkms - source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.0.5/zfs-2.0.5.tar.gz - source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.0.5/zfs-2.0.5.tar.gz.asc + source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.0/zfs-2.1.0.tar.gz + source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.0/zfs-2.1.0.tar.gz.asc source = 0001-only-build-the-module-in-dkms.conf.patch validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027 validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B - sha256sums = 3a17498d704ebf4c5d7231660f6fb44ae07a1545519f567452a4270851a86ec9 + sha256sums = 60bddcb630284c771dcf5a1109ca9329d16523a3a40a374019955cfbf97bf34f sha256sums = SKIP sha256sums = 780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409 - b2sums = 4505c43a3b9a6c2b925383d00bbd9f17505290ded83f9bd3f08211769fa39254742340bdda65efd53f87f1708138517f91f8a43c01f3ce4191de200c84c77754 + b2sums = f7cc1cde711c255bacb000207b8e9a594105d18601a503d75a2a3055ed29ca941e148492fe52809f81a250848cfb5868b3d1c42860464a3d7d744a416db08929 b2sums = SKIP b2sums = 1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50 pkgname = zfs-dkms - depends = zfs-utils=2.0.5 + depends = zfs-utils=2.1.0 depends = dkms diff --git a/PKGBUILD b/PKGBUILD index 8053076..26ce7e3 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # All my PKGBUILDs are managed at https://github.com/eli-schwartz/pkgbuilds pkgname=zfs-dkms -pkgver=2.0.5 +pkgver=2.1.0 pkgrel=1 pkgdesc="Kernel modules for the Zettabyte File System." arch=('any') @@ -17,10 +17,10 @@ provides+=('zfs') replaces=('spl-dkms') source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc} "0001-only-build-the-module-in-dkms.conf.patch") -sha256sums=('3a17498d704ebf4c5d7231660f6fb44ae07a1545519f567452a4270851a86ec9' +sha256sums=('60bddcb630284c771dcf5a1109ca9329d16523a3a40a374019955cfbf97bf34f' 'SKIP' '780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409') -b2sums=('4505c43a3b9a6c2b925383d00bbd9f17505290ded83f9bd3f08211769fa39254742340bdda65efd53f87f1708138517f91f8a43c01f3ce4191de200c84c77754' +b2sums=('f7cc1cde711c255bacb000207b8e9a594105d18601a503d75a2a3055ed29ca941e148492fe52809f81a250848cfb5868b3d1c42860464a3d7d744a416db08929' 'SKIP' '1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50') validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) -- cgit v1.2.1 From 2cbf275dc6807693affd640e6e271c0fbb997e6a Mon Sep 17 00:00:00 2001 From: Jonathon Fernyhough Date: Fri, 1 Oct 2021 11:41:02 +0100 Subject: ZFS 2.1.1 upstream release --- .SRCINFO | 16 ++++++++-------- PKGBUILD | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 91a6342..d04fc14 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,28 +1,28 @@ pkgbase = zfs-dkms pkgdesc = Kernel modules for the Zettabyte File System. - pkgver = 2.1.0 + pkgver = 2.1.1 pkgrel = 1 url = https://zfsonlinux.org/ arch = any license = CDDL - provides = ZFS-MODULE=2.1.0 - provides = SPL-MODULE=2.1.0 + provides = ZFS-MODULE=2.1.1 + provides = SPL-MODULE=2.1.1 provides = spl-dkms provides = zfs conflicts = spl-dkms replaces = spl-dkms - source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.0/zfs-2.1.0.tar.gz - source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.0/zfs-2.1.0.tar.gz.asc + source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.1/zfs-2.1.1.tar.gz + source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.1/zfs-2.1.1.tar.gz.asc source = 0001-only-build-the-module-in-dkms.conf.patch validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027 validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B - sha256sums = 60bddcb630284c771dcf5a1109ca9329d16523a3a40a374019955cfbf97bf34f + sha256sums = bd4f48d009f3b5e291390bde62b0131b8bf3fab09f4fc0fa3591b1f2e7074cff sha256sums = SKIP sha256sums = 780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409 - b2sums = f7cc1cde711c255bacb000207b8e9a594105d18601a503d75a2a3055ed29ca941e148492fe52809f81a250848cfb5868b3d1c42860464a3d7d744a416db08929 + b2sums = 09ee6bd30e8266342bd975454086049c3fd9142e7dacfe52166575c20e3c92688f9b457d75b2a2068fc281e65f78e1d47450545504cdf8bc31e23663545d7800 b2sums = SKIP b2sums = 1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50 pkgname = zfs-dkms - depends = zfs-utils=2.1.0 + depends = zfs-utils=2.1.1 depends = dkms diff --git a/PKGBUILD b/PKGBUILD index 26ce7e3..7b78937 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # All my PKGBUILDs are managed at https://github.com/eli-schwartz/pkgbuilds pkgname=zfs-dkms -pkgver=2.1.0 +pkgver=2.1.1 pkgrel=1 pkgdesc="Kernel modules for the Zettabyte File System." arch=('any') @@ -17,10 +17,10 @@ provides+=('zfs') replaces=('spl-dkms') source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc} "0001-only-build-the-module-in-dkms.conf.patch") -sha256sums=('60bddcb630284c771dcf5a1109ca9329d16523a3a40a374019955cfbf97bf34f' +sha256sums=('bd4f48d009f3b5e291390bde62b0131b8bf3fab09f4fc0fa3591b1f2e7074cff' 'SKIP' '780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409') -b2sums=('f7cc1cde711c255bacb000207b8e9a594105d18601a503d75a2a3055ed29ca941e148492fe52809f81a250848cfb5868b3d1c42860464a3d7d744a416db08929' +b2sums=('09ee6bd30e8266342bd975454086049c3fd9142e7dacfe52166575c20e3c92688f9b457d75b2a2068fc281e65f78e1d47450545504cdf8bc31e23663545d7800' 'SKIP' '1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50') validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) -- cgit v1.2.1 From 7411b9e8b8dd1bbbdee0ad11737357efcb2cd1bd Mon Sep 17 00:00:00 2001 From: Jonathon Fernyhough Date: Sat, 18 Dec 2021 14:50:13 +0000 Subject: Upstream 2.1.2 --- .SRCINFO | 16 ++++++++-------- PKGBUILD | 6 +++--- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index d04fc14..a3f87c8 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,28 +1,28 @@ pkgbase = zfs-dkms pkgdesc = Kernel modules for the Zettabyte File System. - pkgver = 2.1.1 + pkgver = 2.1.2 pkgrel = 1 url = https://zfsonlinux.org/ arch = any license = CDDL - provides = ZFS-MODULE=2.1.1 - provides = SPL-MODULE=2.1.1 + provides = ZFS-MODULE=2.1.2 + provides = SPL-MODULE=2.1.2 provides = spl-dkms provides = zfs conflicts = spl-dkms replaces = spl-dkms - source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.1/zfs-2.1.1.tar.gz - source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.1/zfs-2.1.1.tar.gz.asc + source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.2/zfs-2.1.2.tar.gz + source = https://github.com/zfsonlinux/zfs/releases/download/zfs-2.1.2/zfs-2.1.2.tar.gz.asc source = 0001-only-build-the-module-in-dkms.conf.patch validpgpkeys = 4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027 validpgpkeys = C33DF142657ED1F7C328A2960AB9E991C6AF658B - sha256sums = bd4f48d009f3b5e291390bde62b0131b8bf3fab09f4fc0fa3591b1f2e7074cff + sha256sums = 258cf1d17a1f668a3b99b61eaf14be06c614df42503db0319bef1b9fc4c8b9e7 sha256sums = SKIP sha256sums = 780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409 - b2sums = 09ee6bd30e8266342bd975454086049c3fd9142e7dacfe52166575c20e3c92688f9b457d75b2a2068fc281e65f78e1d47450545504cdf8bc31e23663545d7800 + b2sums = ab4e2d85200438373c7eeeaa5256a712dbfb2862b85de1fb7554ad0cc2b9f8e1255ab4564bca62f65a81a823adb8c112957e6e8771b8e5e6944c3731bc894584 b2sums = SKIP b2sums = 1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50 pkgname = zfs-dkms - depends = zfs-utils=2.1.1 + depends = zfs-utils=2.1.2 depends = dkms diff --git a/PKGBUILD b/PKGBUILD index 7b78937..25423b4 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -4,7 +4,7 @@ # All my PKGBUILDs are managed at https://github.com/eli-schwartz/pkgbuilds pkgname=zfs-dkms -pkgver=2.1.1 +pkgver=2.1.2 pkgrel=1 pkgdesc="Kernel modules for the Zettabyte File System." arch=('any') @@ -17,10 +17,10 @@ provides+=('zfs') replaces=('spl-dkms') source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"{,.asc} "0001-only-build-the-module-in-dkms.conf.patch") -sha256sums=('bd4f48d009f3b5e291390bde62b0131b8bf3fab09f4fc0fa3591b1f2e7074cff' +sha256sums=('258cf1d17a1f668a3b99b61eaf14be06c614df42503db0319bef1b9fc4c8b9e7' 'SKIP' '780e590383fb00389c5e02ac15709b7a476d9e07d3c4935ed9eb67c951a88409') -b2sums=('09ee6bd30e8266342bd975454086049c3fd9142e7dacfe52166575c20e3c92688f9b457d75b2a2068fc281e65f78e1d47450545504cdf8bc31e23663545d7800' +b2sums=('ab4e2d85200438373c7eeeaa5256a712dbfb2862b85de1fb7554ad0cc2b9f8e1255ab4564bca62f65a81a823adb8c112957e6e8771b8e5e6944c3731bc894584' 'SKIP' '1fdae935043d979b9241f07f8baa25a9a0367c24c31c84a59dfe8d6b468a523d8f49b68da3c7fd3194db6638f9d7bef046fc5e2669ce25d73c65009c16bf6c50') validpgpkeys=('4F3BA9AB6D1F8D683DC2DFB56AD860EED4598027' # Tony Hutter (GPG key for signing ZFS releases) -- cgit v1.2.1