From 2d81bca083efc63e9d5812dbb5f23d7601c6e955 Mon Sep 17 00:00:00 2001 From: Archzfs Buildbot <34833957+archzfs-bot@users.noreply.github.com> Date: Sun, 26 Aug 2018 19:02:28 +0000 Subject: [PATCH] Semi-automated update for kernel 4.18.5.a-1 + zfs 0.7.9 --- .SRCINFO | 6 +++--- PKGBUILD | 12 ++++++------ zfs.install | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 37b6f69..c1637bb 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,15 +1,15 @@ pkgbase = zfs-linux-hardened - pkgver = 0.7.9_4.18.2.a.1 + pkgver = 0.7.9_4.18.5.a.1 pkgrel = 2 url = http://zfsonlinux.org/ arch = x86_64 license = CDDL - makedepends = linux-hardened-headers=4.18.2.a-1 + makedepends = linux-hardened-headers=4.18.5.a-1 makedepends = spl-linux-hardened-headers depends = kmod depends = spl-linux-hardened depends = zfs-utils-common=0.7.9 - depends = linux-hardened=4.18.2.a-1 + depends = linux-hardened=4.18.5.a-1 source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.9/zfs-0.7.9.tar.gz source = upstream-ac09630-Fix-zpl_mount-deadlock.patch source = upstream-9f64c1e-Linux-4.18-compat-inode-timespec_timespec64.patch diff --git a/PKGBUILD b/PKGBUILD index 6fd29f7..4a6fb15 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -18,9 +18,9 @@ pkgbase="zfs-linux-hardened" pkgname=("zfs-linux-hardened" "zfs-linux-hardened-headers") -pkgver=0.7.9_4.18.2.a.1 +pkgver=0.7.9_4.18.5.a.1 pkgrel=2 -makedepends=("linux-hardened-headers=4.18.2.a-1" "spl-linux-hardened-headers") +makedepends=("linux-hardened-headers=4.18.5.a-1" "spl-linux-hardened-headers") arch=("x86_64") url="http://zfsonlinux.org/" source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.9/zfs-0.7.9.tar.gz" @@ -32,7 +32,7 @@ sha256sums=("f50ca2441c6abde4fe6b9f54d5583a45813031d6bb72b0011b00fc2683cd9f7a" "03ed45af40850c3a51a6fd14f36c1adc06501c688a67afb13db4fded6ec9db1d" "afbde4a2507dff989404665dbbdfe18eecf5aba716a6513902affa0e4cb033fe") license=("CDDL") -depends=("kmod" 'spl-linux-hardened' "zfs-utils-common=0.7.9" "linux-hardened=4.18.2.a-1") +depends=("kmod" 'spl-linux-hardened' "zfs-utils-common=0.7.9" "linux-hardened=4.18.5.a-1") prepare() { cd "${srcdir}/zfs-0.7.9" patch -Np1 -i ${srcdir}/upstream-ac09630-Fix-zpl_mount-deadlock.patch @@ -46,8 +46,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.18.2.a-1-hardened/build \ - --with-linux-obj=/usr/lib/modules/4.18.2.a-1-hardened/build + --with-linux=/usr/lib/modules/4.18.5.a-1-hardened/build \ + --with-linux-obj=/usr/lib/modules/4.18.5.a-1-hardened/build make } @@ -72,5 +72,5 @@ package_zfs-linux-hardened-headers() { make DESTDIR="${pkgdir}" install rm -r "${pkgdir}/lib" # Remove reference to ${srcdir} - sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.18.2.a-1-hardened/Module.symvers + sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.18.5.a-1-hardened/Module.symvers } diff --git a/zfs.install b/zfs.install index 7be2791..89e57ad 100644 --- a/zfs.install +++ b/zfs.install @@ -12,7 +12,7 @@ post_upgrade() { check_initramfs() { echo ">>> Updating ZFS module dependencies" - depmod -a 4.18.2.a-1-hardened + depmod -a 4.18.5.a-1-hardened 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"'