Semi-automated update for kernel 5.6.11.a-1 + zfs 0.8.3

This commit is contained in:
Archzfs Buildbot 2020-05-11 21:06:37 +00:00
parent c7749d0538
commit 398edab769
2 changed files with 10 additions and 12 deletions

View File

@ -1,13 +1,13 @@
pkgbase = zfs-linux-hardened pkgbase = zfs-linux-hardened
pkgver = 0.8.3_5.6.10.a.1 pkgver = 0.8.3_5.6.11.a.1
pkgrel = 1 pkgrel = 2
url = https://zfsonlinux.org/ url = https://zfsonlinux.org/
arch = x86_64 arch = x86_64
license = CDDL license = CDDL
makedepends = linux-hardened-headers=5.6.10.a-1 makedepends = linux-hardened-headers=5.6.11.a-1
depends = kmod depends = kmod
depends = zfs-utils=0.8.3 depends = zfs-utils=0.8.3
depends = linux-hardened=5.6.10.a-1 depends = linux-hardened=5.6.11.a-1
source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.3/zfs-0.8.3.tar.gz source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.8.3/zfs-0.8.3.tar.gz
source = linux-5.5-compat-blkg_tryget.patch source = linux-5.5-compat-blkg_tryget.patch
source = linux-5.6-compat-struct-proc_ops.patch source = linux-5.6-compat-struct-proc_ops.patch

View File

@ -18,11 +18,11 @@
pkgbase="zfs-linux-hardened" pkgbase="zfs-linux-hardened"
pkgname=("zfs-linux-hardened" "zfs-linux-hardened-headers") pkgname=("zfs-linux-hardened" "zfs-linux-hardened-headers")
_zfsver="0.8.3" _zfsver="0.8.3"
_kernelver="5.6.10.a-1" _kernelver="5.6.11.a-1"
_extramodules="5.6.10.a-1-hardened" _extramodules="5.6.11.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}") makedepends=("linux-hardened-headers=${_kernelver}")
arch=("x86_64") arch=("x86_64")
url="https://zfsonlinux.org/" url="https://zfsonlinux.org/"
@ -53,8 +53,8 @@ build() {
cd "${srcdir}/zfs-${_zfsver}" cd "${srcdir}/zfs-${_zfsver}"
./autogen.sh ./autogen.sh
./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --libdir=/usr/lib \ ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --libdir=/usr/lib \
--datadir=/usr/share --includedir=/usr/include --with-udevdir=/lib/udev \ --datadir=/usr/share --includedir=/usr/include --with-udevdir=/usr/lib/udev \
--libexecdir=/usr/lib/zfs-${_zfsver} --with-config=kernel \ --libexecdir=/usr/lib --with-config=kernel \
--with-linux=/usr/lib/modules/${_extramodules}/build \ --with-linux=/usr/lib/modules/${_extramodules}/build \
--with-linux-obj=/usr/lib/modules/${_extramodules}/build --with-linux-obj=/usr/lib/modules/${_extramodules}/build
make make
@ -68,9 +68,7 @@ package_zfs-linux-hardened() {
conflicts=("zfs-dkms" "zfs-dkms-git" "zfs-dkms-rc" "spl-dkms" "spl-dkms-git" 'zfs-linux-hardened-git' 'spl-linux-hardened') conflicts=("zfs-dkms" "zfs-dkms-git" "zfs-dkms-rc" "spl-dkms" "spl-dkms-git" 'zfs-linux-hardened-git' 'spl-linux-hardened')
replaces=("spl-linux-hardened") replaces=("spl-linux-hardened")
cd "${srcdir}/zfs-${_zfsver}" cd "${srcdir}/zfs-${_zfsver}"
make DESTDIR="${pkgdir}" install make DESTDIR="${pkgdir}" INSTALL_MOD_PATH=/usr install
cp -r "${pkgdir}"/{lib,usr}
rm -r "${pkgdir}"/lib
# Remove src dir # Remove src dir
rm -r "${pkgdir}"/usr/src rm -r "${pkgdir}"/usr/src
} }