summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorArchzfs Buildbot2018-11-26 21:46:55 +0000
committerArchzfs Buildbot2018-11-26 21:46:55 +0000
commitd5de6ffd8c5f001a97af58b33cb8d684d7da4968 (patch)
treed5957dbda24bc66d1429dbee217bdd59447070dc
parentaaac4a6fb34c21c2b018e625d40dc965610276cb (diff)
downloadaur-d5de6ffd8c5f001a97af58b33cb8d684d7da4968.tar.gz
Semi-automated update for kernel 4.19.4.arch1-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 b5de94c86f9a..f9594dfa963e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = zfs-linux-git
- pkgver = 2018.11.20.r4835.g8005ca4f7_4.19.4.arch1.1
+ pkgver = 2018.11.26.r4836.g62ee31adc_4.19.4.arch1.1
pkgrel = 1
url = http://zfsonlinux.org/
arch = x86_64
@@ -7,9 +7,9 @@ pkgbase = zfs-linux-git
makedepends = linux-headers=4.19.4.arch1-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=4.19.4.arch1-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-git
@@ -20,6 +20,7 @@ pkgname = zfs-linux-git
provides = spl
conflicts = zfs-dkms
conflicts = zfs-dkms-git
+ conflicts = zfs-dkms-rc
conflicts = zfs-linux
conflicts = spl-linux-git
conflicts = spl-linux
@@ -34,6 +35,7 @@ pkgname = zfs-linux-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 8bb82014c69d..3ca512b45d09 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,8 +17,8 @@
#
pkgbase="zfs-linux-git"
pkgname=("zfs-linux-git" "zfs-linux-git-headers")
-_commit='8005ca4f749f71397197292452ca539a25286b89'
-_zfsver="2018.11.20.r4835.g8005ca4f7"
+_commit='62ee31adcebe64a1b7cdf1225356108a924c595a'
+_zfsver="2018.11.26.r4836.g62ee31adc"
_kernelver="4.19.4.arch1-1"
_extramodules="${_kernelver/.arch/-arch}-ARCH"
@@ -48,7 +48,7 @@ package_zfs-linux-git() {
install=zfs.install
provides=("zfs" "spl")
groups=("archzfs-linux-git")
- conflicts=("zfs-dkms" "zfs-dkms-git" 'zfs-linux' 'spl-linux-git' 'spl-linux' "spl-dkms" "spl-dkms-git")
+ conflicts=("zfs-dkms" "zfs-dkms-git" "zfs-dkms-rc" 'zfs-linux' 'spl-linux-git' 'spl-linux' "spl-dkms" "spl-dkms-git")
replaces=("spl-linux-git")
cd "${srcdir}/zfs"
make DESTDIR="${pkgdir}" install
@@ -61,7 +61,7 @@ package_zfs-linux-git() {
package_zfs-linux-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"