summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorArchzfs Buildbot2018-11-26 21:47:27 +0000
committerArchzfs Buildbot2018-11-26 21:47:27 +0000
commit7a7b38f3c6bcbac2f21e136d134ab0502b3eebb6 (patch)
tree846717b17d570f4aa107201ae10a1cdd59109eb2
parent4450149c1466dc58048421bc194218a42252f0df (diff)
downloadaur-7a7b38f3c6bcbac2f21e136d134ab0502b3eebb6.tar.gz
Semi-automated update for kernel 4.19.4.a-1 + latest git commit
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD8
2 files changed, 9 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5af2cefb5f57..112a3ea05f03 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = zfs-linux-hardened-git
- pkgver = 2018.11.20.r4835.g8005ca4f7_4.19.4.a.1
+ pkgver = 2018.11.26.r4836.g62ee31adc_4.19.4.a.1
pkgrel = 1
url = http://zfsonlinux.org/
arch = x86_64
@@ -7,9 +7,9 @@ pkgbase = zfs-linux-hardened-git
makedepends = linux-hardened-headers=4.19.4.a-1
makedepends = git
depends = kmod
- depends = zfs-utils-git=2018.11.20.r4835.g8005ca4f7
+ depends = zfs-utils-git=2018.11.26.r4836.g62ee31adc
depends = linux-hardened=4.19.4.a-1
- source = git+https://github.com/zfsonlinux/zfs.git#commit=8005ca4f749f71397197292452ca539a25286b89
+ source = git+https://github.com/zfsonlinux/zfs.git#commit=62ee31adcebe64a1b7cdf1225356108a924c595a
sha256sums = SKIP
pkgname = zfs-linux-hardened-git
@@ -20,6 +20,7 @@ pkgname = zfs-linux-hardened-git
provides = spl
conflicts = zfs-dkms
conflicts = zfs-dkms-git
+ conflicts = zfs-dkms-rc
conflicts = zfs-linux-hardened
conflicts = spl-linux-hardened-git
conflicts = spl-linux-hardened
@@ -34,6 +35,7 @@ pkgname = zfs-linux-hardened-git-headers
conflicts = zfs-headers
conflicts = zfs-dkms
conflicts = zfs-dkms-git
+ conflicts = zfs-dkms-rc
conflicts = spl-dkms
conflicts = spl-dkms-git
conflicts = spl-headers
diff --git a/PKGBUILD b/PKGBUILD
index ff30508baba8..fd5384d7ebf2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,8 +17,8 @@
#
pkgbase="zfs-linux-hardened-git"
pkgname=("zfs-linux-hardened-git" "zfs-linux-hardened-git-headers")
-_commit='8005ca4f749f71397197292452ca539a25286b89'
-_zfsver="2018.11.20.r4835.g8005ca4f7"
+_commit='62ee31adcebe64a1b7cdf1225356108a924c595a'
+_zfsver="2018.11.26.r4836.g62ee31adc"
_kernelver="4.19.4.a-1"
_extramodules="4.19.4.a-1-hardened"
@@ -48,7 +48,7 @@ package_zfs-linux-hardened-git() {
install=zfs.install
provides=("zfs" "spl")
groups=("archzfs-linux-hardened-git")
- conflicts=("zfs-dkms" "zfs-dkms-git" 'zfs-linux-hardened' 'spl-linux-hardened-git' 'spl-linux-hardened' "spl-dkms" "spl-dkms-git")
+ conflicts=("zfs-dkms" "zfs-dkms-git" "zfs-dkms-rc" 'zfs-linux-hardened' 'spl-linux-hardened-git' 'spl-linux-hardened' "spl-dkms" "spl-dkms-git")
replaces=("spl-linux-hardened-git")
cd "${srcdir}/zfs"
make DESTDIR="${pkgdir}" install
@@ -61,7 +61,7 @@ package_zfs-linux-hardened-git() {
package_zfs-linux-hardened-git-headers() {
pkgdesc="Kernel headers for the Zettabyte File System."
provides=("zfs-headers" "spl-headers")
- conflicts=("zfs-headers" "zfs-dkms" "zfs-dkms-git" "spl-dkms" "spl-dkms-git" "spl-headers")
+ conflicts=("zfs-headers" "zfs-dkms" "zfs-dkms-git" "zfs-dkms-rc" "spl-dkms" "spl-dkms-git" "spl-headers")
cd "${srcdir}/zfs"
make DESTDIR="${pkgdir}" install
rm -r "${pkgdir}/lib"