summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO35
-rw-r--r--PKGBUILD47
-rw-r--r--zfs.install2
3 files changed, 52 insertions, 32 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 083da7634376..ec23ae3f2c60 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,33 @@
# Generated by mksrcinfo v8
-# Mon May 29 03:15:44 UTC 2017
+# Mon Jul 17 07:04:29 UTC 2017
pkgbase = zfs-linux-lts
- pkgdesc = Kernel modules for the Zettabyte File System.
- pkgver = 0.6.5.9_4.9.30_1
+ pkgver = 0.6.5.11_4.9.37_1
pkgrel = 1
url = http://zfsonlinux.org/
- install = zfs.install
arch = x86_64
- groups = archzfs-linux-lts
license = CDDL
- makedepends = linux-lts-headers=4.9.30
+ makedepends = linux-lts-headers=4.9.37
+ makedepends = libelf
+ makedepends = spl-linux-lts-headers
depends = kmod
depends = spl-linux-lts
- depends = zfs-utils-linux-lts
- depends = linux-lts=4.9.30
- provides = zfs
- conflicts = zfs-linux
- conflicts = zfs-linux-git
- source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.6.5.9/zfs-0.6.5.9.tar.gz
- sha256sums = b724b57dbddae59246fdc15f88f1224061c712945bb36412a2087e0c7760d77f
+ depends = zfs-utils-common
+ depends = linux-lts=4.9.37
+ source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.6.5.11/zfs-0.6.5.11.tar.gz
+ sha256sums = 136b3061737f1a43f5310919cacbf1b8a0db72b792ef8b1606417aff16dab59d
pkgname = zfs-linux-lts
+ pkgdesc = Kernel modules for the Zettabyte File System.
+ install = zfs.install
+ groups = archzfs-linux-lts
+ provides = zfs
+ conflicts = zfs-linux-lts-git
+
+pkgname = zfs-linux-lts-headers
+ pkgdesc = Kernel headers for the Zettabyte File System.
+ conflicts = zfs-linux-lts-git-headers
+ conflicts = zfs-linux-headers
+ conflicts = zfs-linux-git-headers
+ conflicts = zfs-linux-hardened-headers
+ conflicts = zfs-linux-hardened-git-headers
diff --git a/PKGBUILD b/PKGBUILD
index 2376cc166e25..45b6fcc6823f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,38 +15,49 @@
# archzfs github page.
#
#
-pkgname="zfs-linux-lts"
-pkgver=0.6.5.9_4.9.30_1
+pkgbase="zfs-linux-lts"
+pkgname=("zfs-linux-lts" "zfs-linux-lts-headers")
+pkgver=0.6.5.11_4.9.37_1
pkgrel=1
-pkgdesc="Kernel modules for the Zettabyte File System."
-depends=("kmod" "spl-linux-lts" "zfs-utils-linux-lts" "linux-lts=4.9.30")
-makedepends=("linux-lts-headers=4.9.30")
+makedepends=("linux-lts-headers=4.9.37" "libelf" "spl-linux-lts-headers")
arch=("x86_64")
url="http://zfsonlinux.org/"
-source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-0.6.5.9/zfs-0.6.5.9.tar.gz")
-sha256sums=("b724b57dbddae59246fdc15f88f1224061c712945bb36412a2087e0c7760d77f")
-groups=("archzfs-linux-lts")
+source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-0.6.5.11/zfs-0.6.5.11.tar.gz")
+sha256sums=("136b3061737f1a43f5310919cacbf1b8a0db72b792ef8b1606417aff16dab59d")
license=("CDDL")
-install=zfs.install
-provides=("zfs")
-conflicts=('zfs-linux' 'zfs-linux-git')
+depends=("kmod" "spl-linux-lts" "zfs-utils-common" "linux-lts=4.9.37")
build() {
- cd "${srcdir}/zfs-0.6.5.9"
+ cd "${srcdir}/zfs-0.6.5.11"
./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-0.6.5.9 --with-config=kernel \
- --with-linux=/usr/lib/modules/4.9.30-1-lts/build \
- --with-linux-obj=/usr/lib/modules/4.9.30-1-lts/build
+ --libexecdir=/usr/lib/zfs-0.6.5.11 --with-config=kernel \
+ --with-linux=/usr/lib/modules/4.9.37-1-lts/build \
+ --with-linux-obj=/usr/lib/modules/4.9.37-1-lts/build
make
}
-package() {
- cd "${srcdir}/zfs-0.6.5.9"
+package_zfs-linux-lts() {
+ pkgdesc="Kernel modules for the Zettabyte File System."
+ install=zfs.install
+ provides=("zfs")
+ groups=("archzfs-linux-lts")
+ conflicts=('zfs-linux-lts-git')
+ cd "${srcdir}/zfs-0.6.5.11"
make DESTDIR="${pkgdir}" install
cp -r "${pkgdir}"/{lib,usr}
rm -r "${pkgdir}"/lib
+ # Remove src dir
+ rm -r "${pkgdir}"/usr/src
+}
+
+package_zfs-linux-lts-headers() {
+ pkgdesc="Kernel headers for the Zettabyte File System."
+ conflicts=('zfs-linux-lts-git-headers' 'zfs-linux-headers' 'zfs-linux-git-headers' 'zfs-linux-hardened-headers' 'zfs-linux-hardened-git-headers')
+ cd "${srcdir}/zfs-0.6.5.11"
+ make DESTDIR="${pkgdir}" install
+ rm -r "${pkgdir}/lib"
# Remove reference to ${srcdir}
- sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.9.30-1-lts/Module.symvers
+ sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.9.37-1-lts/Module.symvers
}
diff --git a/zfs.install b/zfs.install
index 33f5192008f6..db6d6f4d6431 100644
--- a/zfs.install
+++ b/zfs.install
@@ -12,7 +12,7 @@ post_upgrade() {
check_initramfs() {
echo ">>> Updating ZFS module dependencies"
- depmod -a 4.9.30-1-lts
+ depmod -a 4.9.37-1-lts
MK_CONF=$(grep -v '#' /etc/mkinitcpio.conf | grep zfs >/dev/null; echo $?);
if [[ ${MK_CONF} == '0' ]]; then
if [[ $1 == 'remove' ]]; then