Semi-automated update for zfs 0.7.12

master
Archzfs Buildbot 6 years ago
parent e4d5d0d81e
commit 196c83c810
  1. 4
      .SRCINFO
  2. 12
      PKGBUILD
  3. 19
      upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch

@ -1,7 +1,7 @@
pkgbase = zfs-dkms pkgbase = zfs-dkms
pkgdesc = Kernel modules for the Zettabyte File System. pkgdesc = Kernel modules for the Zettabyte File System.
pkgver = 0.7.12 pkgver = 0.7.12
pkgrel = 1 pkgrel = 2
url = http://zfsonlinux.org/ url = http://zfsonlinux.org/
arch = x86_64 arch = x86_64
groups = archzfs-dkms groups = archzfs-dkms
@ -15,7 +15,9 @@ pkgbase = zfs-dkms
conflicts = zfs conflicts = zfs
conflicts = zfs-headers conflicts = zfs-headers
source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.12/zfs-0.7.12.tar.gz source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.12/zfs-0.7.12.tar.gz
source = upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch
sha256sums = 720e3b221c1ba5d4c18c990e48b86a2eb613575a0c3cc84c0aa784b17b7c2848 sha256sums = 720e3b221c1ba5d4c18c990e48b86a2eb613575a0c3cc84c0aa784b17b7c2848
sha256sums = 6f27c3dae57c424e06aec31df6c1e1a821e547aa4e933f2f9b894b5e6762b52d
pkgname = zfs-dkms pkgname = zfs-dkms

@ -9,17 +9,23 @@ pkgname="zfs-dkms"
pkgdesc="Kernel modules for the Zettabyte File System." pkgdesc="Kernel modules for the Zettabyte File System."
pkgver=0.7.12 pkgver=0.7.12
pkgrel=1 pkgrel=2
makedepends=() makedepends=()
arch=("x86_64") arch=("x86_64")
url="http://zfsonlinux.org/" url="http://zfsonlinux.org/"
source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz") source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz"
sha256sums=("720e3b221c1ba5d4c18c990e48b86a2eb613575a0c3cc84c0aa784b17b7c2848") "upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch")
sha256sums=("720e3b221c1ba5d4c18c990e48b86a2eb613575a0c3cc84c0aa784b17b7c2848"
"6f27c3dae57c424e06aec31df6c1e1a821e547aa4e933f2f9b894b5e6762b52d")
license=("CDDL") license=("CDDL")
depends=('spl-dkms' "zfs-utils=${pkgver}" "lsb-release" "dkms") depends=('spl-dkms' "zfs-utils=${pkgver}" "lsb-release" "dkms")
provides=("zfs" "zfs-headers") provides=("zfs" "zfs-headers")
groups=("archzfs-dkms") groups=("archzfs-dkms")
conflicts=("zfs" "zfs-headers") conflicts=("zfs" "zfs-headers")
prepare() {
cd "${srcdir}/zfs-${pkgver}"
patch -Np1 -i ${srcdir}/upstream-4f981f6-additional-fixes-for-current_kernel_time-in-4.20.patch
}
build() { build() {
cd "${srcdir}/zfs-${pkgver}" cd "${srcdir}/zfs-${pkgver}"

@ -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…
Cancel
Save