summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD20
-rw-r--r--zfs.install2
3 files changed, 20 insertions, 14 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 7e63b491432b..d9ef40befebe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,18 @@
# Generated by mksrcinfo v8
-# Fri Aug 25 18:24:29 UTC 2017
+# Fri Sep 8 09:14:21 UTC 2017
pkgbase = zfs-linux-git
- pkgver = 0.7.0.r46.g2209e4098.4.12.8.2
- pkgrel = 3
+ pkgver = 0.7.0.r64.ge0dd0a32a.4.12.10.1
+ pkgrel = 1
url = http://zfsonlinux.org/
arch = x86_64
license = CDDL
- makedepends = linux-headers=4.12.8-2
+ makedepends = linux-headers=4.12.10-1
makedepends = git
makedepends = spl-linux-git-headers
depends = kmod
depends = spl-linux-git
- depends = zfs-utils-common-git>=0.7.0.r46.g2209e4098
- depends = linux=4.12.8-2
+ depends = zfs-utils-common-git>=0.7.0.r64.ge0dd0a32a
+ depends = linux=4.12.10-1
source = git+https://github.com/zfsonlinux/zfs.git
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 5be35efd2d73..cb51d251399f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -16,15 +16,21 @@
#
pkgbase="zfs-linux-git"
pkgname=("zfs-linux-git" "zfs-linux-git-headers")
-pkgver=0.7.0.r46.g2209e4098.4.12.8.2
-pkgrel=3
-makedepends=("linux-headers=4.12.8-2" "git" "spl-linux-git-headers")
+
+pkgver=0.7.0.r64.ge0dd0a32a.4.12.10.1
+pkgrel=1
+makedepends=("linux-headers=4.12.10-1" "git" "spl-linux-git-headers")
arch=("x86_64")
url="http://zfsonlinux.org/"
source=("git+https://github.com/zfsonlinux/zfs.git")
sha256sums=("SKIP")
license=("CDDL")
-depends=("kmod" "spl-linux-git" "zfs-utils-common-git>=0.7.0.r46.g2209e4098" "linux=4.12.8-2")
+depends=("kmod" "spl-linux-git" "zfs-utils-common-git>=0.7.0.r64.ge0dd0a32a" "linux=4.12.10-1")
+
+pkgver() {
+ cd "${srcdir}/zfs"
+ echo $(git describe --long | sed 's/^zfs-//;s/\([^-]*-g\)/r\1/;s/-/./g').4.12.10.1
+}
build() {
cd "${srcdir}/zfs"
@@ -32,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.1 --with-config=kernel \
- --with-linux=/usr/lib/modules/4.12.8-2-ARCH/build \
- --with-linux-obj=/usr/lib/modules/4.12.8-2-ARCH/build
+ --with-linux=/usr/lib/modules/4.12.10-1-ARCH/build \
+ --with-linux-obj=/usr/lib/modules/4.12.10-1-ARCH/build
make
}
@@ -59,5 +65,5 @@ package_zfs-linux-git-headers() {
make DESTDIR="${pkgdir}" install
rm -r "${pkgdir}/lib"
# Remove reference to ${srcdir}
- sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.12.8-2-ARCH/Module.symvers
+ sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.12.10-1-ARCH/Module.symvers
}
diff --git a/zfs.install b/zfs.install
index b3a768cc87c7..67929696d635 100644
--- a/zfs.install
+++ b/zfs.install
@@ -12,7 +12,7 @@ post_upgrade() {
check_initramfs() {
echo ">>> Updating ZFS module dependencies"
- depmod -a 4.12.8-2-ARCH
+ depmod -a 4.12.10-1-ARCH
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"'