From b8f9f79c69356abb5b34f6083580e6edbf417196 Mon Sep 17 00:00:00 2001 From: Jesus Alvarez Date: Tue, 6 Feb 2018 11:06:15 -0800 Subject: [PATCH] Semi-automated update for 4.15.1.2-1 --- .SRCINFO | 14 ++++++-------- PKGBUILD | 24 ++++++++++++------------ zfs.install | 2 +- 3 files changed, 19 insertions(+), 21 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index d3322a2..ce24a58 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,19 +1,17 @@ -# Generated by mksrcinfo v8 -# Wed Jan 24 19:36:09 UTC 2018 pkgbase = zfs-linux - pkgver = 0.7.5.4.14.15.1 + pkgver = 0.7.6.4.15.1.2 pkgrel = 1 url = http://zfsonlinux.org/ arch = x86_64 license = CDDL - makedepends = linux-headers=4.14.15-1 + makedepends = linux-headers=4.15.1-2 makedepends = spl-linux-headers depends = kmod depends = spl-linux - depends = zfs-utils-common=0.7.5 - depends = linux=4.14.15-1 - source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.5/zfs-0.7.5.tar.gz - sha256sums = SKIP + depends = zfs-utils-common=0.7.6 + depends = linux=4.15.1-2 + source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.6/zfs-0.7.6.tar.gz + sha256sums = 1687f4041a990e35caccc4751aa736e8e55123b81d5f5a35b11916d9e580c23d pkgname = zfs-linux pkgdesc = Kernel modules for the Zettabyte File System. diff --git a/PKGBUILD b/PKGBUILD index 7df7a7d..246a298 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -17,24 +17,24 @@ pkgbase="zfs-linux" pkgname=("zfs-linux" "zfs-linux-headers") -pkgver=0.7.5.4.14.15.1 +pkgver=0.7.6.4.15.1.2 pkgrel=1 -makedepends=("linux-headers=4.14.15-1" "spl-linux-headers") +makedepends=("linux-headers=4.15.1-2" "spl-linux-headers") arch=("x86_64") url="http://zfsonlinux.org/" -source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.5/zfs-0.7.5.tar.gz") -sha256sums=("SKIP") +source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-0.7.6/zfs-0.7.6.tar.gz") +sha256sums=("1687f4041a990e35caccc4751aa736e8e55123b81d5f5a35b11916d9e580c23d") license=("CDDL") -depends=("kmod" "spl-linux" "zfs-utils-common=0.7.5" "linux=4.14.15-1") +depends=("kmod" "spl-linux" "zfs-utils-common=0.7.6" "linux=4.15.1-2") build() { - cd "${srcdir}/zfs-0.7.5" + cd "${srcdir}/zfs-0.7.6" ./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.7.5 --with-config=kernel \ - --with-linux=/usr/lib/modules/4.14.15-1-ARCH/build \ - --with-linux-obj=/usr/lib/modules/4.14.15-1-ARCH/build + --libexecdir=/usr/lib/zfs-0.7.6 --with-config=kernel \ + --with-linux=/usr/lib/modules/4.15.1-2-ARCH/build \ + --with-linux-obj=/usr/lib/modules/4.15.1-2-ARCH/build make } @@ -45,7 +45,7 @@ package_zfs-linux() { groups=("archzfs-linux") conflicts=('zfs-linux-git') replaces=("zfs-git") - cd "${srcdir}/zfs-0.7.5" + cd "${srcdir}/zfs-0.7.6" make DESTDIR="${pkgdir}" install cp -r "${pkgdir}"/{lib,usr} rm -r "${pkgdir}"/lib @@ -56,9 +56,9 @@ package_zfs-linux() { package_zfs-linux-headers() { pkgdesc="Kernel headers for the Zettabyte File System." conflicts=('zfs-archiso-linux-headers' 'zfs-archiso-linux-git-headers' 'zfs-linux-hardened-headers' 'zfs-linux-hardened-git-headers' 'zfs-linux-lts-headers' 'zfs-linux-lts-git-headers' 'zfs-linux-git-headers' 'zfs-linux-vfio-headers' 'zfs-linux-vfio-git-headers' 'zfs-linux-zen-headers' 'zfs-linux-zen-git-headers' ) - cd "${srcdir}/zfs-0.7.5" + cd "${srcdir}/zfs-0.7.6" make DESTDIR="${pkgdir}" install rm -r "${pkgdir}/lib" # Remove reference to ${srcdir} - sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.14.15-1-ARCH/Module.symvers + sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.15.1-2-ARCH/Module.symvers } diff --git a/zfs.install b/zfs.install index a56d299..062e1eb 100644 --- a/zfs.install +++ b/zfs.install @@ -12,7 +12,7 @@ post_upgrade() { check_initramfs() { echo ">>> Updating ZFS module dependencies" - depmod -a 4.14.15-1-ARCH + depmod -a 4.15.1-2-ARCH 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"'