summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesus Alvarez2017-12-26 09:54:07 -0800
committerJesus Alvarez2017-12-26 09:54:07 -0800
commit6311475e3dc30519c7ecd1cc6ed92b6891c38fd3 (patch)
tree836511d11b718841b37597be8079d8c21f46b5f8
parentf05596e96a3cc03f8550ae7987e24a67498c20cc (diff)
downloadaur-6311475e3dc30519c7ecd1cc6ed92b6891c38fd3.tar.gz
Semi-automated update for 4.9.71.1-1
-rw-r--r--.SRCINFO13
-rw-r--r--PKGBUILD16
-rw-r--r--zfs.install2
3 files changed, 16 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 50fd393fa6b7..06635ede2749 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,20 @@
# Generated by mksrcinfo v8
-# Fri Dec 22 01:11:09 UTC 2017
+# Sun Dec 24 18:51:12 UTC 2017
pkgbase = zfs-linux-lts-git
- pkgver = 2017.12.21.r3220.a8b2e3068.4.9.70.1
+ pkgver = 2017.12.22.r3222.823d48bfb.4.9.71.1
pkgrel = 1
url = http://zfsonlinux.org/
arch = x86_64
license = CDDL
- makedepends = linux-lts-headers=4.9.70-1
+ makedepends = linux-lts-headers=4.9.71-1
makedepends = libelf
makedepends = git
makedepends = spl-linux-lts-git-headers
depends = kmod
depends = spl-linux-lts-git
- depends = zfs-utils-common-git=2017.12.21.r3220.a8b2e3068
- depends = linux-lts=4.9.70-1
- source = git+https://github.com/zfsonlinux/zfs.git#commit=a8b2e30685c9214ccfd0181977540e080340df4e
+ depends = zfs-utils-common-git=2017.12.22.r3222.823d48bfb
+ depends = linux-lts=4.9.71-1
+ source = git+https://github.com/zfsonlinux/zfs.git#commit=823d48bfb182137c53b9432498f1f0564eaa8bfc
sha256sums = SKIP
pkgname = zfs-linux-lts-git
@@ -27,6 +27,7 @@ pkgname = zfs-linux-lts-git
pkgname = zfs-linux-lts-git-headers
pkgdesc = Kernel headers for the Zettabyte File System.
conflicts = zfs-archiso-linux-headers
+ conflicts = zfs-archiso-linux-git-headers
conflicts = zfs-linux-hardened-headers
conflicts = zfs-linux-hardened-git-headers
conflicts = zfs-linux-lts-headers
diff --git a/PKGBUILD b/PKGBUILD
index dc5bb76cbf08..667ac12980f2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -18,15 +18,15 @@
pkgbase="zfs-linux-lts-git"
pkgname=("zfs-linux-lts-git" "zfs-linux-lts-git-headers")
-pkgver=2017.12.21.r3220.a8b2e3068.4.9.70.1
+pkgver=2017.12.22.r3222.823d48bfb.4.9.71.1
pkgrel=1
-makedepends=("linux-lts-headers=4.9.70-1" "libelf" "git" "spl-linux-lts-git-headers")
+makedepends=("linux-lts-headers=4.9.71-1" "libelf" "git" "spl-linux-lts-git-headers")
arch=("x86_64")
url="http://zfsonlinux.org/"
-source=("git+https://github.com/zfsonlinux/zfs.git#commit=a8b2e30685c9214ccfd0181977540e080340df4e")
+source=("git+https://github.com/zfsonlinux/zfs.git#commit=823d48bfb182137c53b9432498f1f0564eaa8bfc")
sha256sums=("SKIP")
license=("CDDL")
-depends=("kmod" "spl-linux-lts-git" "zfs-utils-common-git=2017.12.21.r3220.a8b2e3068" "linux-lts=4.9.70-1")
+depends=("kmod" "spl-linux-lts-git" "zfs-utils-common-git=2017.12.22.r3222.823d48bfb" "linux-lts=4.9.71-1")
build() {
cd "${srcdir}/zfs"
@@ -34,8 +34,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.5 --with-config=kernel \
- --with-linux=/usr/lib/modules/4.9.70-1-lts/build \
- --with-linux-obj=/usr/lib/modules/4.9.70-1-lts/build
+ --with-linux=/usr/lib/modules/4.9.71-1-lts/build \
+ --with-linux-obj=/usr/lib/modules/4.9.71-1-lts/build
make
}
@@ -55,10 +55,10 @@ package_zfs-linux-lts-git() {
package_zfs-linux-lts-git-headers() {
pkgdesc="Kernel headers for the Zettabyte File System."
- conflicts=('zfs-archiso-linux-headers' 'zfs-linux-hardened-headers' 'zfs-linux-hardened-git-headers' 'zfs-linux-lts-headers' 'zfs-linux-headers' 'zfs-linux-git-headers' 'zfs-linux-vfio-headers' 'zfs-linux-vfio-git-headers' 'zfs-linux-zen-headers' 'zfs-linux-zen-git-headers' )
+ 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-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"
make DESTDIR="${pkgdir}" install
rm -r "${pkgdir}/lib"
# Remove reference to ${srcdir}
- sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.9.70-1-lts/Module.symvers
+ sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.9.71-1-lts/Module.symvers
}
diff --git a/zfs.install b/zfs.install
index 4c74cfdef58b..0f1f8d0600e3 100644
--- a/zfs.install
+++ b/zfs.install
@@ -12,7 +12,7 @@ post_upgrade() {
check_initramfs() {
echo ">>> Updating ZFS module dependencies"
- depmod -a 4.9.70-1-lts
+ depmod -a 4.9.71-1-lts
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"'