summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorArchzfs Buildbot2018-08-07 10:05:00 +0000
committerArchzfs Buildbot2018-08-07 10:05:00 +0000
commit06579ac1ef208fd9d67e4545da947010ed3547f0 (patch)
tree7479654a4b99e120c80c453302298e45922760e9
parente85d90ec85364ded04759d2b7e6db4dff1644908 (diff)
downloadaur-06579ac1ef208fd9d67e4545da947010ed3547f0.tar.gz
Semi-automated update for kernel 4.17.12.zen1-1 + zfs 0.7.9
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD12
-rw-r--r--zfs.install2
3 files changed, 10 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 799aec149e2f..9436daa60eac 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
pkgbase = zfs-linux-zen
- pkgver = 0.7.9.4.17.11.1
+ pkgver = 0.7.9.4.17.12.zen1.1
pkgrel = 1
url = http://zfsonlinux.org/
arch = x86_64
license = CDDL
- makedepends = linux-zen-headers=4.17.11-1
+ makedepends = linux-zen-headers=4.17.12.zen1-1
makedepends = spl-linux-zen-headers
depends = kmod
depends = spl-linux-zen
depends = zfs-utils-common=0.7.9
- depends = linux-zen=4.17.11-1
+ depends = linux-zen=4.17.12.zen1-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
sha256sums = f50ca2441c6abde4fe6b9f54d5583a45813031d6bb72b0011b00fc2683cd9f7a
diff --git a/PKGBUILD b/PKGBUILD
index c2e8a84ed151..022b1b386680 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,15 +18,15 @@
pkgbase="zfs-linux-zen"
pkgname=("zfs-linux-zen" "zfs-linux-zen-headers")
-pkgver=0.7.9.4.17.11.1
+pkgver=0.7.9.4.17.12.zen1.1
pkgrel=1
-makedepends=("linux-zen-headers=4.17.11-1" "spl-linux-zen-headers")
+makedepends=("linux-zen-headers=4.17.12.zen1-1" "spl-linux-zen-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" "upstream-ac09630-Fix-zpl_mount-deadlock.patch")
sha256sums=("f50ca2441c6abde4fe6b9f54d5583a45813031d6bb72b0011b00fc2683cd9f7a" "1799f6f7b2a60a23b66106c9470414628398f6bfc10da3d0f41c548bba6130e8")
license=("CDDL")
-depends=("kmod" 'spl-linux-zen' "zfs-utils-common=0.7.9" "linux-zen=4.17.11-1")
+depends=("kmod" 'spl-linux-zen' "zfs-utils-common=0.7.9" "linux-zen=4.17.12.zen1-1")
prepare() {
cd "${srcdir}/zfs-0.7.9"
patch -Np1 -i ${srcdir}/upstream-ac09630-Fix-zpl_mount-deadlock.patch
@@ -38,8 +38,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.17.11-zen1/build \
- --with-linux-obj=/usr/lib/modules/4.17.11-zen1/build
+ --with-linux=/usr/lib/modules/4.17.12-zen1-1-zen/build \
+ --with-linux-obj=/usr/lib/modules/4.17.12-zen1-1-zen/build
make
}
@@ -64,5 +64,5 @@ package_zfs-linux-zen-headers() {
make DESTDIR="${pkgdir}" install
rm -r "${pkgdir}/lib"
# Remove reference to ${srcdir}
- sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.17.11-zen1/Module.symvers
+ sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.17.12-zen1-1-zen/Module.symvers
}
diff --git a/zfs.install b/zfs.install
index 5bc4e69cdf03..35a9cebfbfc5 100644
--- a/zfs.install
+++ b/zfs.install
@@ -12,7 +12,7 @@ post_upgrade() {
check_initramfs() {
echo ">>> Updating ZFS module dependencies"
- depmod -a 4.17.11-zen1
+ depmod -a 4.17.12-zen1-1-zen
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"'