diff options
-rw-r--r-- | .SRCINFO | 10 | ||||
-rw-r--r-- | PKGBUILD | 14 | ||||
-rw-r--r-- | zfs.install | 2 |
3 files changed, 13 insertions, 13 deletions
@@ -1,15 +1,15 @@ pkgbase = zfs-linux-lts-git - pkgver = 2018.07.31.r4657.g492f64e94.4.14.56.1 + pkgver = 2018.08.03.r4665.gc8c308362.4.14.60.1 pkgrel = 1 url = http://zfsonlinux.org/ arch = x86_64 license = CDDL - makedepends = linux-lts-headers=4.14.56-1 + makedepends = linux-lts-headers=4.14.60-1 makedepends = git depends = kmod - depends = zfs-utils-common-git=2018.07.31.r4657.g492f64e94 - depends = linux-lts=4.14.56-1 - source = git+https://github.com/zfsonlinux/zfs.git#commit=492f64e941e3d6b947d1cc387a1a380c0c738b09 + depends = zfs-utils-common-git=2018.08.03.r4665.gc8c308362 + depends = linux-lts=4.14.60-1 + source = git+https://github.com/zfsonlinux/zfs.git#commit=c8c308362c2f0a43adbe21a44b3443a27d2c7ca9 source = upstream-ac09630-Fix-zpl_mount-deadlock.patch sha256sums = SKIP sha256sums = 1799f6f7b2a60a23b66106c9470414628398f6bfc10da3d0f41c548bba6130e8 @@ -18,15 +18,15 @@ pkgbase="zfs-linux-lts-git" pkgname=("zfs-linux-lts-git" "zfs-linux-lts-git-headers") -pkgver=2018.07.31.r4657.g492f64e94.4.14.56.1 +pkgver=2018.08.03.r4665.gc8c308362.4.14.60.1 pkgrel=1 -makedepends=("linux-lts-headers=4.14.56-1" "git") +makedepends=("linux-lts-headers=4.14.60-1" "git") arch=("x86_64") url="http://zfsonlinux.org/" -source=("git+https://github.com/zfsonlinux/zfs.git#commit=492f64e941e3d6b947d1cc387a1a380c0c738b09" "upstream-ac09630-Fix-zpl_mount-deadlock.patch") +source=("git+https://github.com/zfsonlinux/zfs.git#commit=c8c308362c2f0a43adbe21a44b3443a27d2c7ca9" "upstream-ac09630-Fix-zpl_mount-deadlock.patch") sha256sums=("SKIP" "1799f6f7b2a60a23b66106c9470414628398f6bfc10da3d0f41c548bba6130e8") license=("CDDL") -depends=("kmod" "zfs-utils-common-git=2018.07.31.r4657.g492f64e94" "linux-lts=4.14.56-1") +depends=("kmod" "zfs-utils-common-git=2018.08.03.r4665.gc8c308362" "linux-lts=4.14.60-1") build() { cd "${srcdir}/zfs" @@ -34,8 +34,8 @@ build() { ./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.7.9 --with-config=kernel \ - --with-linux=/usr/lib/modules/4.14.56-1-lts/build \ - --with-linux-obj=/usr/lib/modules/4.14.56-1-lts/build + --with-linux=/usr/lib/modules/4.14.60-1-lts/build \ + --with-linux-obj=/usr/lib/modules/4.14.60-1-lts/build make } @@ -61,5 +61,5 @@ package_zfs-linux-lts-git-headers() { make DESTDIR="${pkgdir}" install rm -r "${pkgdir}/lib" # Remove reference to ${srcdir} - sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.14.56-1-lts/Module.symvers + sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.14.60-1-lts/Module.symvers } diff --git a/zfs.install b/zfs.install index d5589dbf927b..c12a2ed13f49 100644 --- a/zfs.install +++ b/zfs.install @@ -12,7 +12,7 @@ post_upgrade() { check_initramfs() { echo ">>> Updating ZFS module dependencies" - depmod -a 4.14.56-1-lts + depmod -a 4.14.60-1-lts MK_CONF=$(grep -v '#' /etc/mkinitcpio.conf | grep zfs >/dev/null; echo $?); if [[ ${MK_CONF} == '0' && $1 == 'remove' ]]; then echo '>>> The ZFS packages have been removed, but "zfs" remains in the "hooks"' |