summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorArchzfs Buildbot2019-05-24 16:05:04 +0000
committerArchzfs Buildbot2019-05-24 16:05:04 +0000
commit056a5b121325ccd490ffc902f370cef998788d5e (patch)
tree9690f311467701ee807e3285866a617c00d02eea
parent192d6646c131b02ea76b5de153ca671cd6c3997f (diff)
downloadaur-056a5b121325ccd490ffc902f370cef998788d5e.tar.gz
Semi-automated update for kernel 5.1.4.arch1-1 + latest git commit
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD8
2 files changed, 10 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 414f303efa6a..f1ae746ebb10 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,16 +1,16 @@
pkgbase = zfs-linux-git
- pkgver = 2019.05.19.r5128.g9dc41a769_5.1.4.arch1.1
+ pkgver = 2019.05.23.r5134.g75c09c506_5.1.4.arch1.1
pkgrel = 1
url = http://zfsonlinux.org/
arch = x86_64
license = CDDL
+ makedepends = python
makedepends = linux-headers=5.1.4.arch1-1
makedepends = git
- makedepends = python
depends = kmod
- depends = zfs-utils-git=2019.05.19.r5128.g9dc41a769
+ depends = zfs-utils-git=2019.05.23.r5134.g75c09c506
depends = linux=5.1.4.arch1-1
- source = git+https://github.com/zfsonlinux/zfs.git#commit=9dc41a769df164875d974c2431b2453e70e16c41
+ source = git+https://github.com/zfsonlinux/zfs.git#commit=75c09c5060b85a144cc794ae857520662dc8fd58
sha256sums = SKIP
pkgname = zfs-linux-git
@@ -22,11 +22,11 @@ pkgname = zfs-linux-git
conflicts = zfs-dkms
conflicts = zfs-dkms-git
conflicts = zfs-dkms-rc
+ conflicts = spl-dkms
+ conflicts = spl-dkms-git
conflicts = zfs-linux
conflicts = spl-linux-git
conflicts = spl-linux
- conflicts = spl-dkms
- conflicts = spl-dkms-git
replaces = spl-linux-git
pkgname = zfs-linux-git-headers
diff --git a/PKGBUILD b/PKGBUILD
index 326a6cfec8f9..a51b8f2478cd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,14 +17,14 @@
#
pkgbase="zfs-linux-git"
pkgname=("zfs-linux-git" "zfs-linux-git-headers")
-_commit='9dc41a769df164875d974c2431b2453e70e16c41'
-_zfsver="2019.05.19.r5128.g9dc41a769"
+_commit='75c09c5060b85a144cc794ae857520662dc8fd58'
+_zfsver="2019.05.23.r5134.g75c09c506"
_kernelver="5.1.4.arch1-1"
_extramodules="5.1.4-arch1-1-ARCH"
pkgver="${_zfsver}_$(echo ${_kernelver} | sed s/-/./g)"
pkgrel=1
-makedepends=("linux-headers=${_kernelver}" "git" "python")
+makedepends=("python" "linux-headers=${_kernelver}" "git")
arch=("x86_64")
url="http://zfsonlinux.org/"
source=("git+https://github.com/zfsonlinux/zfs.git#commit=${_commit}")
@@ -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-dkms-rc" 'zfs-linux' 'spl-linux-git' 'spl-linux' "spl-dkms" "spl-dkms-git")
+ conflicts=("zfs-dkms" "zfs-dkms-git" "zfs-dkms-rc" "spl-dkms" "spl-dkms-git" 'zfs-linux' 'spl-linux-git' 'spl-linux')
replaces=("spl-linux-git")
cd "${srcdir}/zfs"
make DESTDIR="${pkgdir}" install