diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 11 | ||||
| -rw-r--r-- | ecb6a50819448cd2d6570298a5ba46b45eded216.diff | 36 |
3 files changed, 45 insertions, 8 deletions
@@ -1,7 +1,7 @@ pkgbase = zfs-dkms-raidz-expansion-git pkgdesc = Kernel modules for the Zettabyte File System. pkgver = 2.1.99 - pkgrel = 1 + pkgrel = 2 epoch = 1 url = https://zfsonlinux.org/ arch = x86_64 @@ -21,9 +21,9 @@ pkgbase = zfs-dkms-raidz-expansion-git replaces = spl-dkms-git source = git+https://github.com/nicman23/zfs.git#branch=ahrens-raidz-expand source = 0001-only-build-the-module-in-dkms.conf.patch + source = ecb6a50819448cd2d6570298a5ba46b45eded216.diff sha256sums = SKIP sha256sums = 539f325e56443554f9b87baff33948b91a280ec1daadcb0c636b105252fcd0f5 - b2sums = SKIP - b2sums = a8ab5da81d214e7801f0f8cdf77c076c714a3f17292df15ca35fcf7aef2c4d505348797e3b1da7590ea303ff488490ddba49e6f9e3f8a0bcc975894d51d97c2b + sha256sums = a60a6e008270b2624b12cf7556832867c29d33ae2bddc06d8205046948a4e0f0 pkgname = zfs-dkms-raidz-expansion-git @@ -7,7 +7,7 @@ pkgname=zfs-dkms-raidz-expansion-git _pkgbase=zfs-dkms-git pkgver=2.1.99 -pkgrel=1 +pkgrel=2 epoch=1 pkgdesc='Kernel modules for the Zettabyte File System.' arch=('x86_64') @@ -20,16 +20,17 @@ provides=("ZFS-MODULE=${pkgver}" "SPL-MODULE=${pkgver}" "${pkgname%-git}=${pkgve conflicts=("${pkgname%-git}" "${_pkgbase%-git}" 'spl-dkms') replaces=('spl-dkms-git') source=('git+https://github.com/nicman23/zfs.git#branch=ahrens-raidz-expand' - "0001-only-build-the-module-in-dkms.conf.patch") + "0001-only-build-the-module-in-dkms.conf.patch" + ecb6a50819448cd2d6570298a5ba46b45eded216.diff) sha256sums=('SKIP' - '539f325e56443554f9b87baff33948b91a280ec1daadcb0c636b105252fcd0f5') -b2sums=('SKIP' - 'a8ab5da81d214e7801f0f8cdf77c076c714a3f17292df15ca35fcf7aef2c4d505348797e3b1da7590ea303ff488490ddba49e6f9e3f8a0bcc975894d51d97c2b') + '539f325e56443554f9b87baff33948b91a280ec1daadcb0c636b105252fcd0f5' + a60a6e008270b2624b12cf7556832867c29d33ae2bddc06d8205046948a4e0f0) prepare() { cd zfs patch -p1 -i ../0001-only-build-the-module-in-dkms.conf.patch + patch -p1 -i ../ecb6a50819448cd2d6570298a5ba46b45eded216.diff # remove unneeded sections from module build sed -ri "/AC_CONFIG_FILES/,/]\)/{ diff --git a/ecb6a50819448cd2d6570298a5ba46b45eded216.diff b/ecb6a50819448cd2d6570298a5ba46b45eded216.diff new file mode 100644 index 000000000000..b4899113ca23 --- /dev/null +++ b/ecb6a50819448cd2d6570298a5ba46b45eded216.diff @@ -0,0 +1,36 @@ +diff --git a/module/os/linux/spl/spl-procfs-list.c b/module/os/linux/spl/spl-procfs-list.c +index a4a24dcae2b..5e073950d61 100644 +--- a/module/os/linux/spl/spl-procfs-list.c ++++ b/module/os/linux/spl/spl-procfs-list.c +@@ -23,9 +23,9 @@ + */ + + #include <sys/list.h> +-#include <sys/mutex.h> + #include <sys/procfs_list.h> + #include <linux/proc_fs.h> ++#include <sys/mutex.h> + + /* + * A procfs_list is a wrapper around a linked list which implements the seq_file +diff --git a/module/os/linux/spl/spl-zone.c b/module/os/linux/spl/spl-zone.c +index 9421f81bf0c..b489179f125 100644 +--- a/module/os/linux/spl/spl-zone.c ++++ b/module/os/linux/spl/spl-zone.c +@@ -25,7 +25,6 @@ + */ + + #include <sys/types.h> +-#include <sys/mutex.h> + #include <sys/sysmacros.h> + #include <sys/kmem.h> + #include <linux/file.h> +@@ -37,6 +36,8 @@ + #include <linux/proc_ns.h> + #endif + ++#include <sys/mutex.h> ++ + static kmutex_t zone_datasets_lock; + static struct list_head zone_datasets; + |