mirror of
https://aur.archlinux.org/zfs-linux-hardened.git
synced 2025-06-06 23:57:25 +02:00
Semi-automated update for kernel 4.19.12.a-1 + zfs 0.7.12
This commit is contained in:
parent
bf51abb41b
commit
ff3afbac6d
10
PKGBUILD
10
PKGBUILD
@ -26,10 +26,16 @@ pkgrel=1
|
||||
makedepends=("linux-hardened-headers=${_kernelver}" "spl-linux-hardened-headers")
|
||||
arch=("x86_64")
|
||||
url="http://zfsonlinux.org/"
|
||||
source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${_zfsver}/zfs-${_zfsver}.tar.gz")
|
||||
sha256sums=("720e3b221c1ba5d4c18c990e48b86a2eb613575a0c3cc84c0aa784b17b7c2848")
|
||||
source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${_zfsver}/zfs-${_zfsver}.tar.gz"
|
||||
"upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch")
|
||||
sha256sums=("720e3b221c1ba5d4c18c990e48b86a2eb613575a0c3cc84c0aa784b17b7c2848"
|
||||
"6f27c3dae57c424e06aec31df6c1e1a821e547aa4e933f2f9b894b5e6762b52d")
|
||||
license=("CDDL")
|
||||
depends=("kmod" 'spl-linux-hardened' "zfs-utils=${_zfsver}" "linux-hardened=${_kernelver}")
|
||||
prepare() {
|
||||
cd "${srcdir}/zfs-${_zfsver}"
|
||||
patch -Np1 -i ${srcdir}/upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
cd "${srcdir}/zfs-${_zfsver}"
|
||||
|
@ -0,0 +1,19 @@
|
||||
diff --git a/include/zpios-ctl.h b/include/zpios-ctl.h
|
||||
index f17f1153260..068c9eaf173 100644
|
||||
--- a/include/zpios-ctl.h
|
||||
+++ b/include/zpios-ctl.h
|
||||
@@ -181,9 +181,12 @@ zpios_timespec_t
|
||||
zpios_timespec_now(void)
|
||||
{
|
||||
zpios_timespec_t zts_now;
|
||||
- struct timespec ts_now;
|
||||
+ #if defined(HAVE_INODE_TIMESPEC64_TIMES)
|
||||
+ inode_timespec_t ts_now = current_kernel_time64();
|
||||
+ #else
|
||||
+ inode_timespec_t ts_now = current_kernel_time();
|
||||
+ #endif
|
||||
|
||||
- ts_now = current_kernel_time();
|
||||
zts_now.ts_sec = ts_now.tv_sec;
|
||||
zts_now.ts_nsec = ts_now.tv_nsec;
|
||||
|
Loading…
x
Reference in New Issue
Block a user