diff options
author | Jesus Alvarez | 2017-12-13 14:15:20 -0800 |
---|---|---|
committer | Jesus Alvarez | 2017-12-13 14:15:20 -0800 |
commit | 4e01bb561977f88ae80571ad42018fd21e7790cb (patch) | |
tree | 4f15cedf0a8c5546fe4a1a00653738692f4bd520 | |
parent | 3b04412f9bbb3ecc201bc591229ae3eec2de56ee (diff) | |
download | aur-4e01bb561977f88ae80571ad42018fd21e7790cb.tar.gz |
Semi-automated update for 4.9.68.1-1
-rw-r--r-- | .SRCINFO | 16 | ||||
-rw-r--r-- | PKGBUILD | 25 | ||||
-rw-r--r-- | zfs.install | 2 |
3 files changed, 20 insertions, 23 deletions
@@ -1,20 +1,20 @@ # Generated by mksrcinfo v8 -# Sun Dec 3 23:28:27 UTC 2017 +# Wed Dec 13 20:12:21 UTC 2017 pkgbase = zfs-linux-lts-git - pkgver = 0.7.0.r200.gd4677269f.4.9.66.1 - pkgrel = 2 + pkgver = 2017.12.08.r3208.4e9b15696.4.9.68.1 + pkgrel = 1 url = http://zfsonlinux.org/ arch = x86_64 license = CDDL - makedepends = linux-lts-headers=4.9.66-1 + makedepends = linux-lts-headers=4.9.68-1 makedepends = libelf makedepends = git makedepends = spl-linux-lts-git-headers depends = kmod depends = spl-linux-lts-git - depends = zfs-utils-common-git>=0.7.0.r200.gd4677269f - depends = linux-lts=4.9.66-1 - source = git+https://github.com/zfsonlinux/zfs.git + depends = zfs-utils-common-git=2017.12.08.r3208.4e9b15696 + depends = linux-lts=4.9.68-1 + source = git+https://github.com/zfsonlinux/zfs.git#commit=4e9b156960562373e005798575a3fbc6d66e32ff sha256sums = SKIP pkgname = zfs-linux-lts-git @@ -32,6 +32,8 @@ pkgname = zfs-linux-lts-git-headers conflicts = zfs-linux-lts-headers conflicts = zfs-linux-headers conflicts = zfs-linux-git-headers + conflicts = zfs-linux-vfio-headers + conflicts = zfs-linux-vfio-git-headers conflicts = zfs-linux-zen-headers conflicts = zfs-linux-zen-git-headers @@ -18,29 +18,24 @@ pkgbase="zfs-linux-lts-git" pkgname=("zfs-linux-lts-git" "zfs-linux-lts-git-headers") -pkgver=0.7.0.r200.gd4677269f.4.9.66.1 -pkgrel=2 -makedepends=("linux-lts-headers=4.9.66-1" "libelf" "git" "spl-linux-lts-git-headers") +pkgver=2017.12.08.r3208.4e9b15696.4.9.68.1 +pkgrel=1 +makedepends=("linux-lts-headers=4.9.68-1" "libelf" "git" "spl-linux-lts-git-headers") arch=("x86_64") url="http://zfsonlinux.org/" -source=("git+https://github.com/zfsonlinux/zfs.git") +source=("git+https://github.com/zfsonlinux/zfs.git#commit=4e9b156960562373e005798575a3fbc6d66e32ff") sha256sums=("SKIP") license=("CDDL") -depends=("kmod" "spl-linux-lts-git" "zfs-utils-common-git>=0.7.0.r200.gd4677269f" "linux-lts=4.9.66-1") - -pkgver() { - cd "${srcdir}/zfs" - echo $(git describe --long | sed 's/^zfs-//;s/\([^-]*-g\)/r\1/;s/-/./g').4.9.66.1 -} +depends=("kmod" "spl-linux-lts-git" "zfs-utils-common-git=2017.12.08.r3208.4e9b15696" "linux-lts=4.9.68-1") build() { cd "${srcdir}/zfs" ./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.3 --with-config=kernel \ - --with-linux=/usr/lib/modules/4.9.66-1-lts/build \ - --with-linux-obj=/usr/lib/modules/4.9.66-1-lts/build + --libexecdir=/usr/lib/zfs-0.7.4 --with-config=kernel \ + --with-linux=/usr/lib/modules/4.9.68-1-lts/build \ + --with-linux-obj=/usr/lib/modules/4.9.68-1-lts/build make } @@ -60,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-zen-headers' 'zfs-linux-zen-git-headers' ) + 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' ) 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.66-1-lts/Module.symvers + sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.9.68-1-lts/Module.symvers } diff --git a/zfs.install b/zfs.install index 0de1ed343aaf..b48da73fffbc 100644 --- a/zfs.install +++ b/zfs.install @@ -12,7 +12,7 @@ post_upgrade() { check_initramfs() { echo ">>> Updating ZFS module dependencies" - depmod -a 4.9.66-1-lts + depmod -a 4.9.68-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"' |