Semi-automated update for kernel 4.18.9.a-1 + zfs 0.7.11

This commit is contained in:
Archzfs Buildbot 2018-09-22 15:14:27 +00:00
parent 24451c3432
commit 2ccbfc676b
2 changed files with 11 additions and 15 deletions

View File

@ -1,6 +1,6 @@
pkgbase = zfs-linux-hardened pkgbase = zfs-linux-hardened
pkgver = 0.7.11_4.18.9.a.1 pkgver = 0.7.11_4.18.9.a.1
pkgrel = 1 pkgrel = 2
url = http://zfsonlinux.org/ url = http://zfsonlinux.org/
arch = x86_64 arch = x86_64
license = CDDL license = CDDL
@ -18,19 +18,14 @@ pkgname = zfs-linux-hardened
install = zfs.install install = zfs.install
groups = archzfs-linux-hardened groups = archzfs-linux-hardened
provides = zfs provides = zfs
conflicts = zfs-dkms
conflicts = zfs-dkms-git
conflicts = zfs-linux-hardened-git conflicts = zfs-linux-hardened-git
pkgname = zfs-linux-hardened-headers pkgname = zfs-linux-hardened-headers
pkgdesc = Kernel headers for the Zettabyte File System. pkgdesc = Kernel headers for the Zettabyte File System.
conflicts = zfs-archiso-linux-headers provides = zfs-headers
conflicts = zfs-archiso-linux-git-headers conflicts = zfs-headers
conflicts = zfs-linux-hardened-git-headers conflicts = zfs-dkms
conflicts = zfs-linux-lts-headers conflicts = zfs-dkms-git
conflicts = zfs-linux-lts-git-headers
conflicts = zfs-linux-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

View File

@ -22,7 +22,7 @@ _kernelver="4.18.9.a-1"
_extramodules="4.18.9.a-1-hardened" _extramodules="4.18.9.a-1-hardened"
pkgver="${_zfsver}_$(echo ${_kernelver} | sed s/-/./g)" pkgver="${_zfsver}_$(echo ${_kernelver} | sed s/-/./g)"
pkgrel=1 pkgrel=2
makedepends=("linux-hardened-headers=${_kernelver}" "spl-linux-hardened-headers") makedepends=("linux-hardened-headers=${_kernelver}" "spl-linux-hardened-headers")
arch=("x86_64") arch=("x86_64")
url="http://zfsonlinux.org/" url="http://zfsonlinux.org/"
@ -47,7 +47,7 @@ package_zfs-linux-hardened() {
install=zfs.install install=zfs.install
provides=("zfs") provides=("zfs")
groups=("archzfs-linux-hardened") groups=("archzfs-linux-hardened")
conflicts=('zfs-linux-hardened-git') conflicts=("zfs-dkms" "zfs-dkms-git" 'zfs-linux-hardened-git')
cd "${srcdir}/zfs-${_zfsver}" cd "${srcdir}/zfs-${_zfsver}"
make DESTDIR="${pkgdir}" install make DESTDIR="${pkgdir}" install
cp -r "${pkgdir}"/{lib,usr} cp -r "${pkgdir}"/{lib,usr}
@ -58,7 +58,8 @@ package_zfs-linux-hardened() {
package_zfs-linux-hardened-headers() { package_zfs-linux-hardened-headers() {
pkgdesc="Kernel headers for the Zettabyte File System." pkgdesc="Kernel headers for the Zettabyte File System."
conflicts=('zfs-archiso-linux-headers' 'zfs-archiso-linux-git-headers' 'zfs-linux-hardened-git-headers' 'zfs-linux-lts-headers' 'zfs-linux-lts-git-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' ) provides=("zfs-headers")
conflicts=("zfs-headers" "zfs-dkms" "zfs-dkms-git")
cd "${srcdir}/zfs-${_zfsver}" cd "${srcdir}/zfs-${_zfsver}"
make DESTDIR="${pkgdir}" install make DESTDIR="${pkgdir}" install
rm -r "${pkgdir}/lib" rm -r "${pkgdir}/lib"