diff --git a/.SRCINFO b/.SRCINFO index 7552217..55ab13d 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,13 +1,13 @@ pkgbase = zfs-linux-hardened - pkgver = 0.8.3_5.6.10.a.1 - pkgrel = 1 + pkgver = 0.8.3_5.6.11.a.1 + pkgrel = 2 url = https://zfsonlinux.org/ arch = x86_64 license = CDDL - makedepends = linux-hardened-headers=5.6.10.a-1 + makedepends = linux-hardened-headers=5.6.11.a-1 depends = kmod 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 = linux-5.5-compat-blkg_tryget.patch source = linux-5.6-compat-struct-proc_ops.patch diff --git a/PKGBUILD b/PKGBUILD index 4dc832f..30b8bd0 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -18,11 +18,11 @@ pkgbase="zfs-linux-hardened" pkgname=("zfs-linux-hardened" "zfs-linux-hardened-headers") _zfsver="0.8.3" -_kernelver="5.6.10.a-1" -_extramodules="5.6.10.a-1-hardened" +_kernelver="5.6.11.a-1" +_extramodules="5.6.11.a-1-hardened" pkgver="${_zfsver}_$(echo ${_kernelver} | sed s/-/./g)" -pkgrel=1 +pkgrel=2 makedepends=("linux-hardened-headers=${_kernelver}") arch=("x86_64") url="https://zfsonlinux.org/" @@ -53,8 +53,8 @@ build() { cd "${srcdir}/zfs-${_zfsver}" ./autogen.sh ./configure --prefix=/usr --sysconfdir=/etc --sbindir=/usr/bin --libdir=/usr/lib \ - --datadir=/usr/share --includedir=/usr/include --with-udevdir=/lib/udev \ - --libexecdir=/usr/lib/zfs-${_zfsver} --with-config=kernel \ + --datadir=/usr/share --includedir=/usr/include --with-udevdir=/usr/lib/udev \ + --libexecdir=/usr/lib --with-config=kernel \ --with-linux=/usr/lib/modules/${_extramodules}/build \ --with-linux-obj=/usr/lib/modules/${_extramodules}/build 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') replaces=("spl-linux-hardened") cd "${srcdir}/zfs-${_zfsver}" - make DESTDIR="${pkgdir}" install - cp -r "${pkgdir}"/{lib,usr} - rm -r "${pkgdir}"/lib + make DESTDIR="${pkgdir}" INSTALL_MOD_PATH=/usr install # Remove src dir rm -r "${pkgdir}"/usr/src }