summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD13
-rw-r--r--zfs.install2
3 files changed, 11 insertions, 13 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4dfb4cf2d393..47e49d88a168 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,21 @@
# Generated by mksrcinfo v8
-# Fri Jul 15 15:27:05 UTC 2016
+# Sun Aug 14 16:54:54 UTC 2016
pkgbase = zfs-linux-git
pkgdesc = Kernel modules for the Zettabyte File System.
- pkgver = 0.6.5_r345_gdfbc863_4.6.4_1
+ pkgver = 0.6.5_r403_ge35c5a8_4.7.0_1
pkgrel = 1
url = http://zfsonlinux.org/
install = zfs.install
arch = x86_64
groups = archzfs-linux-git
license = CDDL
- makedepends = linux-headers=4.6.4
+ makedepends = linux-headers=4.7
makedepends = git
depends = kmod
depends = spl-linux-git
depends = zfs-utils-linux-git
- depends = linux=4.6.4
+ depends = linux=4.7
provides = zfs
- replaces = zfs-git
source = git+https://github.com/zfsonlinux/zfs.git
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 4bbc20a1b820..3e8b5a0c6162 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,11 +15,11 @@
# archzfs github page.
#
pkgname="zfs-linux-git"
-pkgver=0.6.5_r345_gdfbc863_4.6.4_1
+pkgver=0.6.5_r403_ge35c5a8_4.7.0_1
pkgrel=1
pkgdesc="Kernel modules for the Zettabyte File System."
-depends=("kmod" "spl-linux-git" "zfs-utils-linux-git" "linux=4.6.4")
-makedepends=("linux-headers=4.6.4" "git")
+depends=("kmod" "spl-linux-git" "zfs-utils-linux-git" "linux=4.7")
+makedepends=("linux-headers=4.7" "git")
arch=("x86_64")
url="http://zfsonlinux.org/"
source=("git+https://github.com/zfsonlinux/zfs.git")
@@ -28,7 +28,6 @@ groups=("archzfs-linux-git")
license=("CDDL")
install=zfs.install
provides=("zfs")
-replaces=("zfs-git")
build() {
cd "${srcdir}/zfs"
@@ -36,8 +35,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.6.5.7 --with-config=kernel \
- --with-linux=/usr/lib/modules/4.6.4-1-ARCH/build \
- --with-linux-obj=/usr/lib/modules/4.6.4-1-ARCH/build
+ --with-linux=/usr/lib/modules/4.7.0-1-ARCH/build \
+ --with-linux-obj=/usr/lib/modules/4.7.0-1-ARCH/build
make
}
@@ -47,5 +46,5 @@ package() {
cp -r "${pkgdir}"/{lib,usr}
rm -r "${pkgdir}"/lib
# Remove reference to ${srcdir}
- sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.6.4-1-ARCH/Module.symvers
+ sed -i "s+${srcdir}++" ${pkgdir}/usr/src/zfs-*/4.7.0-1-ARCH/Module.symvers
}
diff --git a/zfs.install b/zfs.install
index ecbe657ef5f2..77b3a45856a7 100644
--- a/zfs.install
+++ b/zfs.install
@@ -12,7 +12,7 @@ post_upgrade() {
check_initramfs() {
echo ">>> Updating ZFS module dependencies"
- depmod -a 4.6.4-1-ARCH
+ depmod -a 4.7.0-1-ARCH
MK_CONF=$(grep -v '#' /etc/mkinitcpio.conf | grep zfs >/dev/null; echo $?);
if [[ ${MK_CONF} == '0' ]]; then
if [[ $1 == 'remove' ]]; then