summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorArchzfs Buildbot2018-12-01 00:26:59 +0000
committerArchzfs Buildbot2018-12-01 00:26:59 +0000
commitac4b965f14275941395679ebd31ff35635b68b6e (patch)
tree0afdbb11a6a01464887eea756b38ea5b516a14de
parent99f22cd922dca92db18b94c7aadfd647c7d4d9d5 (diff)
downloadaur-ac4b965f14275941395679ebd31ff35635b68b6e.tar.gz
Semi-automated update for kernel 4.19.5.a-1 + zfs 0.7.12
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD4
2 files changed, 7 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2f94792f7ff1..f2fc069c6029 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
pkgbase = zfs-linux-hardened
- pkgver = 0.7.12_4.19.4.a.1
+ pkgver = 0.7.12_4.19.5.a.1
pkgrel = 1
url = http://zfsonlinux.org/
arch = x86_64
license = CDDL
- makedepends = linux-hardened-headers=4.19.4.a-1
+ makedepends = linux-hardened-headers=4.19.5.a-1
makedepends = spl-linux-hardened-headers
depends = kmod
depends = spl-linux-hardened
depends = zfs-utils=0.7.12
- depends = linux-hardened=4.19.4.a-1
+ depends = linux-hardened=4.19.5.a-1
source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.12/zfs-0.7.12.tar.gz
sha256sums = 720e3b221c1ba5d4c18c990e48b86a2eb613575a0c3cc84c0aa784b17b7c2848
@@ -20,6 +20,7 @@ pkgname = zfs-linux-hardened
provides = zfs
conflicts = zfs-dkms
conflicts = zfs-dkms-git
+ conflicts = zfs-dkms-rc
conflicts = zfs-linux-hardened-git
pkgname = zfs-linux-hardened-headers
@@ -28,4 +29,5 @@ pkgname = zfs-linux-hardened-headers
conflicts = zfs-headers
conflicts = zfs-dkms
conflicts = zfs-dkms-git
+ conflicts = zfs-dkms-rc
diff --git a/PKGBUILD b/PKGBUILD
index 1a50d61fae7c..b37ccf0a029a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,8 +18,8 @@
pkgbase="zfs-linux-hardened"
pkgname=("zfs-linux-hardened" "zfs-linux-hardened-headers")
_zfsver="0.7.12"
-_kernelver="4.19.4.a-1"
-_extramodules="4.19.4.a-1-hardened"
+_kernelver="4.19.5.a-1"
+_extramodules="4.19.5.a-1-hardened"
pkgver="${_zfsver}_$(echo ${_kernelver} | sed s/-/./g)"
pkgrel=1