summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesus Alvarez2018-03-06 21:43:20 -0800
committerJesus Alvarez2018-03-06 21:43:20 -0800
commit3f0ac1e4ef841b9f1aa78460f7f5db833d7088c0 (patch)
tree327a890be1a202cb339bd795e17e543aceef0c68
parentbb58860e893640d5189fca9813934aec7b371a19 (diff)
downloadaur-3f0ac1e4ef841b9f1aa78460f7f5db833d7088c0.tar.gz
Semi-automated update for 4.14.23.1-2
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD10
2 files changed, 11 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a4fd51e1cb47..2719bbab3c41 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = zfs-linux-lts-git
- pkgver = 2018.03.02.r3346.5666a994f.4.14.23.1
- pkgrel = 1
+ pkgver = 2018.03.06.r3353.639b18944.4.14.23.1
+ pkgrel = 2
url = http://zfsonlinux.org/
arch = x86_64
license = CDDL
@@ -10,9 +10,9 @@ pkgbase = zfs-linux-lts-git
makedepends = spl-linux-lts-git-headers
depends = kmod
depends = spl-linux-lts-git
- depends = zfs-utils-common-git=2018.03.02.r3346.5666a994f
+ depends = zfs-utils-common-git=2018.03.06.r3353.639b18944
depends = linux-lts=4.14.23-1
- source = git+https://github.com/zfsonlinux/zfs.git#commit=5666a994f2b17f1d720efa83d4c64b1ed7bb53d0
+ source = git+https://github.com/zfsonlinux/zfs.git#commit=639b18944a6a3483c02039621c02dac08a954a90
sha256sums = SKIP
pkgname = zfs-linux-lts-git
@@ -31,6 +31,8 @@ pkgname = zfs-linux-lts-git-headers
conflicts = zfs-linux-lts-headers
conflicts = zfs-linux-headers
conflicts = zfs-linux-git-headers
+ conflicts = zfs-linux-threadripper-headers
+ conflicts = zfs-linux-threadripper-git-headers
conflicts = zfs-linux-vfio-headers
conflicts = zfs-linux-vfio-git-headers
conflicts = zfs-linux-zen-headers
diff --git a/PKGBUILD b/PKGBUILD
index 0ff40c992829..f3f864990ea1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,15 +18,15 @@
pkgbase="zfs-linux-lts-git"
pkgname=("zfs-linux-lts-git" "zfs-linux-lts-git-headers")
-pkgver=2018.03.02.r3346.5666a994f.4.14.23.1
-pkgrel=1
+pkgver=2018.03.06.r3353.639b18944.4.14.23.1
+pkgrel=2
makedepends=("linux-lts-headers=4.14.23-1" "libelf" "git" "spl-linux-lts-git-headers")
arch=("x86_64")
url="http://zfsonlinux.org/"
-source=("git+https://github.com/zfsonlinux/zfs.git#commit=5666a994f2b17f1d720efa83d4c64b1ed7bb53d0")
+source=("git+https://github.com/zfsonlinux/zfs.git#commit=639b18944a6a3483c02039621c02dac08a954a90")
sha256sums=("SKIP")
license=("CDDL")
-depends=("kmod" "spl-linux-lts-git" "zfs-utils-common-git=2018.03.02.r3346.5666a994f" "linux-lts=4.14.23-1")
+depends=("kmod" "spl-linux-lts-git" "zfs-utils-common-git=2018.03.06.r3353.639b18944" "linux-lts=4.14.23-1")
build() {
cd "${srcdir}/zfs"
@@ -55,7 +55,7 @@ package_zfs-linux-lts-git() {
package_zfs-linux-lts-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-headers' 'zfs-linux-git-headers' 'zfs-linux-vfio-headers' 'zfs-linux-vfio-git-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-headers' 'zfs-linux-git-headers' 'zfs-linux-threadripper-headers' 'zfs-linux-threadripper-git-headers' 'zfs-linux-vfio-headers' 'zfs-linux-vfio-git-headers' 'zfs-linux-zen-headers' 'zfs-linux-zen-git-headers' )
cd "${srcdir}/zfs"
make DESTDIR="${pkgdir}" install
rm -r "${pkgdir}/lib"