summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorArchzfs Buildbot2018-08-24 06:59:33 +0000
committerArchzfs Buildbot2018-08-24 06:59:33 +0000
commit58400a4c82c3aaedc996f7e77303380f030fe102 (patch)
treed29492f82805a88ef79a3bafaafd15bc738ffe0f
parent6d430770d24f53c7d6c67632e0c2fd073dc21205 (diff)
downloadaur-58400a4c82c3aaedc996f7e77303380f030fe102.tar.gz
Semi-automated update for kernel 4.18.4.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 8007492bd40c..a3f3042fbdb7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,15 @@
pkgbase = zfs-linux-zen
- pkgver = 0.7.9.4.18.3.zen1.2
+ pkgver = 0.7.9.4.18.4.zen1.1
pkgrel = 1
url = http://zfsonlinux.org/
arch = x86_64
license = CDDL
- makedepends = linux-zen-headers=4.18.3.zen1-2
+ makedepends = linux-zen-headers=4.18.4.zen1-1
makedepends = spl-linux-zen-headers
depends = kmod
depends = spl-linux-zen
depends = zfs-utils-common=0.7.9
- depends = linux-zen=4.18.3.zen1-2
+ depends = linux-zen=4.18.4.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
source = upstream-9f64c1e-Linux-4.18-compat-inode-timespec_timespec64.patch
diff --git a/PKGBUILD b/PKGBUILD
index 2b2b0ff2e1d4..a48092194f68 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,9 +18,9 @@
pkgbase="zfs-linux-zen"
pkgname=("zfs-linux-zen" "zfs-linux-zen-headers")
-pkgver=0.7.9.4.18.3.zen1.2
+pkgver=0.7.9.4.18.4.zen1.1
pkgrel=1
-makedepends=("linux-zen-headers=4.18.3.zen1-2" "spl-linux-zen-headers")
+makedepends=("linux-zen-headers=4.18.4.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"
@@ -32,7 +32,7 @@ sha256sums=("f50ca2441c6abde4fe6b9f54d5583a45813031d6bb72b0011b00fc2683cd9f7a"
"03ed45af40850c3a51a6fd14f36c1adc06501c688a67afb13db4fded6ec9db1d"
"afbde4a2507dff989404665dbbdfe18eecf5aba716a6513902affa0e4cb033fe")
license=("CDDL")
-depends=("kmod" 'spl-linux-zen' "zfs-utils-common=0.7.9" "linux-zen=4.18.3.zen1-2")
+depends=("kmod" 'spl-linux-zen' "zfs-utils-common=0.7.9" "linux-zen=4.18.4.zen1-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.3-zen1-2-zen/build \
- --with-linux-obj=/usr/lib/modules/4.18.3-zen1-2-zen/build
+ --with-linux=/usr/lib/modules/4.18.4-zen1-1-zen/build \
+ --with-linux-obj=/usr/lib/modules/4.18.4-zen1-1-zen/build
make
}
@@ -72,5 +72,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.18.3-zen1-2-zen/Module.symvers
+ sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.18.4-zen1-1-zen/Module.symvers
}
diff --git a/zfs.install b/zfs.install
index 7ff0da401084..1cdf914f5b34 100644
--- a/zfs.install
+++ b/zfs.install
@@ -12,7 +12,7 @@ post_upgrade() {
check_initramfs() {
echo ">>> Updating ZFS module dependencies"
- depmod -a 4.18.3-zen1-2-zen
+ depmod -a 4.18.4-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"'