summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorArchzfs Buildbot2020-05-11 21:06:54 +0000
committerArchzfs Buildbot2020-05-11 21:06:54 +0000
commitd44b803376e724cf34be2d4dccebbe402bc15171 (patch)
tree088f396052708af793f722ba6ad6560c842d68d4
parentab7564af175d7610ffb454877ad634951d405c83 (diff)
downloadaur-d44b803376e724cf34be2d4dccebbe402bc15171.tar.gz
Semi-automated update for kernel 5.6.11.arch1-1 + zfs 0.8.3
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD10
2 files changed, 5 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0593bc1f5af..40d1c190c7a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = zfs-linux
pkgver = 0.8.3_5.6.11.arch1.1
- pkgrel = 1
+ pkgrel = 2
url = https://zfsonlinux.org/
arch = x86_64
license = CDDL
diff --git a/PKGBUILD b/PKGBUILD
index 44062b42659..13a5a9ca6be 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,7 +22,7 @@ _kernelver="5.6.11.arch1-1"
_extramodules="${_kernelver/.arch/-arch}"
pkgver="${_zfsver}_$(echo ${_kernelver} | sed s/-/./g)"
-pkgrel=1
+pkgrel=2
makedepends=("linux-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() {
conflicts=("zfs-dkms" "zfs-dkms-git" "zfs-dkms-rc" "spl-dkms" "spl-dkms-git" 'zfs-linux-git' 'zfs-linux-rc' 'spl-linux')
replaces=("spl-linux")
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
}