summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorArchzfs Buildbot2018-09-22 15:14:00 +0000
committerArchzfs Buildbot2018-09-22 15:14:00 +0000
commit184e37503f002d47dc311e3708884052d00d6028 (patch)
tree3ec925d28ac2c6d4ffb2aa6e182e86d1808e9f71
parentf6ffcbd4f54afaa4cca006eccffe6c41932b466a (diff)
downloadaur-184e37503f002d47dc311e3708884052d00d6028.tar.gz
Semi-automated update for kernel 4.18.9.arch1-1 + zfs 0.7.11
-rw-r--r--.SRCINFO19
-rw-r--r--PKGBUILD7
2 files changed, 11 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2e4b3b616d1..fa7387b08d0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = zfs-linux
pkgver = 0.7.11_4.18.9.arch1.1
- pkgrel = 1
+ pkgrel = 2
url = http://zfsonlinux.org/
arch = x86_64
license = CDDL
@@ -18,20 +18,15 @@ pkgname = zfs-linux
install = zfs.install
groups = archzfs-linux
provides = zfs
+ conflicts = zfs-dkms
+ conflicts = zfs-dkms-git
conflicts = zfs-linux-git
replaces = zfs-git
pkgname = zfs-linux-headers
pkgdesc = Kernel headers for the Zettabyte File System.
- conflicts = zfs-archiso-linux-headers
- conflicts = zfs-archiso-linux-git-headers
- conflicts = zfs-linux-hardened-headers
- conflicts = zfs-linux-hardened-git-headers
- conflicts = zfs-linux-lts-headers
- conflicts = zfs-linux-lts-git-headers
- conflicts = zfs-linux-git-headers
- conflicts = zfs-linux-vfio-headers
- conflicts = zfs-linux-vfio-git-headers
- conflicts = zfs-linux-zen-headers
- conflicts = zfs-linux-zen-git-headers
+ provides = zfs-headers
+ conflicts = zfs-headers
+ conflicts = zfs-dkms
+ conflicts = zfs-dkms-git
diff --git a/PKGBUILD b/PKGBUILD
index c6563f34690..a1eb585f844 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,7 +22,7 @@ _kernelver="4.18.9.arch1-1"
_extramodules="${_kernelver/.arch/-arch}-ARCH"
pkgver="${_zfsver}_$(echo ${_kernelver} | sed s/-/./g)"
-pkgrel=1
+pkgrel=2
makedepends=("linux-headers=${_kernelver}" "spl-linux-headers")
arch=("x86_64")
url="http://zfsonlinux.org/"
@@ -47,7 +47,7 @@ package_zfs-linux() {
install=zfs.install
provides=("zfs")
groups=("archzfs-linux")
- conflicts=('zfs-linux-git')
+ conflicts=("zfs-dkms" "zfs-dkms-git" 'zfs-linux-git')
replaces=("zfs-git")
cd "${srcdir}/zfs-${_zfsver}"
make DESTDIR="${pkgdir}" install
@@ -59,7 +59,8 @@ package_zfs-linux() {
package_zfs-linux-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-git-headers' 'zfs-linux-vfio-headers' 'zfs-linux-vfio-git-headers' 'zfs-linux-zen-headers' 'zfs-linux-zen-git-headers' )
+ provides=("zfs-headers")
+ conflicts=("zfs-headers" "zfs-dkms" "zfs-dkms-git")
cd "${srcdir}/zfs-${_zfsver}"
make DESTDIR="${pkgdir}" install
rm -r "${pkgdir}/lib"