summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesus Alvarez2018-03-12 17:10:32 -0700
committerJesus Alvarez2018-03-12 17:10:32 -0700
commit6a5101f48f6bdaa2097244817667f5b8000edab0 (patch)
treedcaf03e52bad3f7209b471c7c669d0fb2e7be5fb
parentf723c5a1b623b0e91779108f95783b360b9a7fb4 (diff)
downloadaur-6a5101f48f6bdaa2097244817667f5b8000edab0.tar.gz
Semi-automated update for 4.15.2.1-1
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD6
2 files changed, 8 insertions, 5 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4356d2393ce4..ef16fdf046c2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
pkgbase = zfs-linux-vfio-git
- pkgver = 2018.03.06.r3353.639b18944.4.15.2.1
+ pkgver = 2018.03.12.r3366.83362e8e6.4.15.2.1
pkgrel = 1
url = http://zfsonlinux.org/
arch = x86_64
@@ -9,7 +9,7 @@ pkgbase = zfs-linux-vfio-git
makedepends = spl-linux-vfio-git-headers
depends = kmod
depends = spl-linux-vfio-git
- depends = zfs-utils-common-git>=2018.03.06.r3353.639b18944
+ depends = zfs-utils-common-git>=2018.03.12.r3366.83362e8e6
depends = linux-vfio=4.15.2-1
source = git+https://github.com/zfsonlinux/zfs.git
sha256sums = SKIP
@@ -20,6 +20,7 @@ pkgname = zfs-linux-vfio-git
groups = archzfs-linux-vfio-git
provides = zfs
conflicts = zfs-linux-vfio
+ replaces = zfs-git
pkgname = zfs-linux-vfio-git-headers
pkgdesc = Kernel headers for the Zettabyte File System.
@@ -33,6 +34,8 @@ pkgname = zfs-linux-vfio-git-headers
conflicts = zfs-linux-git-headers
conflicts = zfs-linux-threadripper-headers
conflicts = zfs-linux-threadripper-git-headers
+ conflicts = zfs-linux-threadripper-vfio-headers
+ conflicts = zfs-linux-threadripper-vfio-git-headers
conflicts = zfs-linux-vfio-headers
conflicts = zfs-linux-zen-headers
conflicts = zfs-linux-zen-git-headers
diff --git a/PKGBUILD b/PKGBUILD
index e54ebb7d13da..65d85ddb4a05 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,7 +17,7 @@
pkgbase="zfs-linux-vfio-git"
pkgname=("zfs-linux-vfio-git" "zfs-linux-vfio-git-headers")
-pkgver=2018.03.06.r3353.639b18944.4.15.2.1
+pkgver=2018.03.12.r3366.83362e8e6.4.15.2.1
pkgrel=1
makedepends=("linux-vfio-headers=4.15.2-1" "git" "spl-linux-vfio-git-headers")
arch=("x86_64")
@@ -25,7 +25,7 @@ url="http://zfsonlinux.org/"
source=("git+https://github.com/zfsonlinux/zfs.git")
sha256sums=("SKIP")
license=("CDDL")
-depends=("kmod" "spl-linux-vfio-git" "zfs-utils-common-git>=2018.03.06.r3353.639b18944" "linux-vfio=4.15.2-1")
+depends=("kmod" "spl-linux-vfio-git" "zfs-utils-common-git>=2018.03.12.r3366.83362e8e6" "linux-vfio=4.15.2-1")
build() {
cd "${srcdir}/zfs"
@@ -55,7 +55,7 @@ package_zfs-linux-vfio-git() {
package_zfs-linux-vfio-git-headers() {
pkgdesc="Kernel headers for the Zettabyte File System."
- conflicts=('zfs-archiso-linux-headers' 'zfs-archiso-linux-git-headers' 'zfs-linux-hardened-headers' 'zfs-linux-hardened-git-headers' 'zfs-linux-lts-headers' 'zfs-linux-lts-git-headers' 'zfs-linux-headers' 'zfs-linux-git-headers' 'zfs-linux-threadripper-headers' 'zfs-linux-threadripper-git-headers' 'zfs-linux-vfio-headers' 'zfs-linux-zen-headers' 'zfs-linux-zen-git-headers' )
+ conflicts=('zfs-archiso-linux-headers' 'zfs-archiso-linux-git-headers' 'zfs-linux-hardened-headers' 'zfs-linux-hardened-git-headers' 'zfs-linux-lts-headers' 'zfs-linux-lts-git-headers' 'zfs-linux-headers' 'zfs-linux-git-headers' 'zfs-linux-threadripper-headers' 'zfs-linux-threadripper-git-headers' 'zfs-linux-threadripper-vfio-headers' 'zfs-linux-threadripper-vfio-git-headers' 'zfs-linux-vfio-headers' 'zfs-linux-zen-headers' 'zfs-linux-zen-git-headers' )
cd "${srcdir}/zfs"
make DESTDIR="${pkgdir}" install
rm -r "${pkgdir}/lib"