summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorArchzfs Buildbot2018-08-26 19:02:32 +0000
committerArchzfs Buildbot2018-08-26 19:02:32 +0000
commitfcd3684753e8ed3bf77d80be92d1726983ad226b (patch)
treecf07ed4b2236868fdda0dc9c3853f90e624f5cbf
parent3d42d0b4ba5b6279c315ba788ae63413cb058367 (diff)
downloadaur-fcd3684753e8ed3bf77d80be92d1726983ad226b.tar.gz
Semi-automated update for kernel 4.18.5.a-1 + latest git commit
-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 2dadd9176b4f..1f492635e449 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,14 @@
pkgbase = zfs-linux-hardened-git
- pkgver = 2018.08.23.r4692.g55972a672.4.18.2.a.1
+ pkgver = 2018.08.23.r4692.g55972a672.4.18.5.a.1
pkgrel = 1
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 = git
depends = kmod
depends = zfs-utils-common-git=2018.08.23.r4692.g55972a672
- depends = linux-hardened=4.18.2.a-1
+ depends = linux-hardened=4.18.5.a-1
source = git+https://github.com/zfsonlinux/zfs.git#commit=55972a6724ca49d98d67a47fe0f0b28ad21260d5
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 b628303f6532..ee018b3e4c16 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,9 +18,9 @@
pkgbase="zfs-linux-hardened-git"
pkgname=("zfs-linux-hardened-git" "zfs-linux-hardened-git-headers")
-pkgver=2018.08.23.r4692.g55972a672.4.18.2.a.1
+pkgver=2018.08.23.r4692.g55972a672.4.18.5.a.1
pkgrel=1
-makedepends=("linux-hardened-headers=4.18.2.a-1" "git")
+makedepends=("linux-hardened-headers=4.18.5.a-1" "git")
arch=("x86_64")
url="http://zfsonlinux.org/"
source=("git+https://github.com/zfsonlinux/zfs.git#commit=55972a6724ca49d98d67a47fe0f0b28ad21260d5"
@@ -32,7 +32,7 @@ sha256sums=("SKIP"
"03ed45af40850c3a51a6fd14f36c1adc06501c688a67afb13db4fded6ec9db1d"
"afbde4a2507dff989404665dbbdfe18eecf5aba716a6513902affa0e4cb033fe")
license=("CDDL")
-depends=("kmod" "zfs-utils-common-git=2018.08.23.r4692.g55972a672" "linux-hardened=4.18.2.a-1")
+depends=("kmod" "zfs-utils-common-git=2018.08.23.r4692.g55972a672" "linux-hardened=4.18.5.a-1")
build() {
cd "${srcdir}/zfs"
@@ -40,8 +40,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
}
@@ -67,5 +67,5 @@ package_zfs-linux-hardened-git-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 7be2791f640b..89e57ad8af1b 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"'