summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorArchzfs Buildbot2018-09-22 15:14:23 +0000
committerArchzfs Buildbot2018-09-22 15:14:23 +0000
commitb377141f47c4baba5498d7130cffbfc7bda871c9 (patch)
treeedf5f06f59dfe9118ba2574c01acc3865c10744f
parente46304013f952208a4e360de7c16efba27704f0f (diff)
downloadaur-b377141f47c4baba5498d7130cffbfc7bda871c9.tar.gz
Semi-automated update for kernel 4.18.9.a-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 2e539ea6d239..075a93cd9f15 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = spl-linux-hardened
pkgver = 0.7.11_4.18.9.a.1
- pkgrel = 1
+ pkgrel = 2
url = http://zfsonlinux.org/
arch = x86_64
license = GPL
@@ -15,19 +15,14 @@ pkgname = spl-linux-hardened
pkgdesc = Solaris Porting Layer kernel modules.
groups = archzfs-linux-hardened
provides = spl
+ conflicts = spl-dkms
+ conflicts = spl-dkms-git
conflicts = spl-linux-hardened-git
pkgname = spl-linux-hardened-headers
pkgdesc = Solaris Porting Layer kernel headers.
- conflicts = spl-archiso-linux-headers
- conflicts = spl-archiso-linux-git-headers
- conflicts = spl-linux-hardened-git-headers
- conflicts = spl-linux-lts-headers
- conflicts = spl-linux-lts-git-headers
- conflicts = spl-linux-headers
- conflicts = spl-linux-git-headers
- conflicts = spl-linux-vfio-headers
- conflicts = spl-linux-vfio-git-headers
- conflicts = spl-linux-zen-headers
- conflicts = spl-linux-zen-git-headers
+ provides = spl-headers
+ conflicts = spl-dkms
+ conflicts = spl-dkms-git
+ conflicts = spl-headers
diff --git a/PKGBUILD b/PKGBUILD
index f4c96287e9ef..bc6b95e1aecd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,7 +22,7 @@ _kernelver="4.18.9.a-1"
_extramodules="4.18.9.a-1-hardened"
pkgver="${_splver}_$(echo ${_kernelver} | sed s/-/./g)"
-pkgrel=1
+pkgrel=2
makedepends=("linux-hardened-headers=${_kernelver}")
arch=("x86_64")
url="http://zfsonlinux.org/"
@@ -45,7 +45,7 @@ package_spl-linux-hardened() {
pkgdesc="Solaris Porting Layer kernel modules."
provides=("spl")
groups=("archzfs-linux-hardened")
- conflicts=('spl-linux-hardened-git')
+ conflicts=("spl-dkms" "spl-dkms-git" 'spl-linux-hardened-git')
cd "${srcdir}/spl-${_splver}"
make DESTDIR="${pkgdir}" install
mv "${pkgdir}/lib" "${pkgdir}/usr/"
@@ -55,7 +55,8 @@ package_spl-linux-hardened() {
package_spl-linux-hardened-headers() {
pkgdesc="Solaris Porting Layer kernel headers."
- conflicts=('spl-archiso-linux-headers' 'spl-archiso-linux-git-headers' 'spl-linux-hardened-git-headers' 'spl-linux-lts-headers' 'spl-linux-lts-git-headers' 'spl-linux-headers' 'spl-linux-git-headers' 'spl-linux-vfio-headers' 'spl-linux-vfio-git-headers' 'spl-linux-zen-headers' 'spl-linux-zen-git-headers' )
+ provides=("spl-headers")
+ conflicts=("spl-dkms" "spl-dkms-git" "spl-headers")
cd "${srcdir}/spl-${_splver}"
make DESTDIR="${pkgdir}" install
rm -r "${pkgdir}/lib"