diff options
| author | Iacopo Isimbaldi | 2017-08-13 19:22:20 +0200 |
|---|---|---|
| committer | Iacopo Isimbaldi | 2017-08-13 19:23:00 +0200 |
| commit | dd12518d0124159044df4402ce09ed7cae19ca62 (patch) | |
| tree | 47f99e3b7892f7e091a49c0400ce1c1d522d5c68 | |
| parent | fcb071a7eda5e66c79740136287d209219359b00 (diff) | |
| parent | 0648149c93911aa211bac5a14b9160a3b5b75485 (diff) | |
| download | aur-dd12518d0124159044df4402ce09ed7cae19ca62.tar.gz | |
Merge branch 'zfs_stable' into zfs_git_wip
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 4 | ||||
| -rw-r--r-- | zfs.initcpio.install | 3 |
3 files changed, 7 insertions, 8 deletions
@@ -1,7 +1,7 @@ # Generated by mksrcinfo v8 -# Sun Feb 12 22:36:09 UTC 2017 +# Sun Aug 13 17:22:42 UTC 2017 pkgbase = zfs-dkms-git - pkgver = 0.7.0_rc3_r89_g717afc132 + pkgver = 0.7.0_r25_g376994828 pkgrel = 1 url = http://zfsonlinux.org/ arch = i686 @@ -15,13 +15,13 @@ pkgbase = zfs-dkms-git source = zfs.initcpio.hook sha256sums = SKIP sha256sums = b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540 - sha256sums = 17114052aa20c528f022f7f1349971aa28810e2ed2c97871226b5679a91f7e77 + sha256sums = aa5706bf08b36209a318762680f3c9fb45b3fc4b8e4ef184c8a5370b2c3000ca sha256sums = 138964b43d7a282e1ed5f7fcf1f8dc9baa4f664655b628eeac1912a3017a787b pkgname = zfs-dkms-git pkgdesc = Kernel modules for the Zettabyte File System. (Git version) depends = spl-dkms-git - depends = zfs-utils-dkms-git=0.7.0_rc3_r89_g717afc132-1 + depends = zfs-utils-dkms-git=0.7.0_r25_g376994828-1 depends = dkms provides = zfs conflicts = zfs-git @@ -4,7 +4,7 @@ pkgbase="zfs-dkms-git" pkgname=("zfs-dkms-git" "zfs-utils-dkms-git") -pkgver=0.7.0_rc3_r89_g717afc132 +pkgver=0.7.0_r25_g376994828 pkgrel=1 license=('CDDL') makedepends=("git" "spl-dkms-git") @@ -16,7 +16,7 @@ source=("git+https://github.com/zfsonlinux/zfs.git" "zfs.initcpio.hook") sha256sums=('SKIP' 'b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540' - '17114052aa20c528f022f7f1349971aa28810e2ed2c97871226b5679a91f7e77' + 'aa5706bf08b36209a318762680f3c9fb45b3fc4b8e4ef184c8a5370b2c3000ca' '138964b43d7a282e1ed5f7fcf1f8dc9baa4f664655b628eeac1912a3017a787b') pkgver() { diff --git a/zfs.initcpio.install b/zfs.initcpio.install index 19364a386a45..3ab0f5266e60 100644 --- a/zfs.initcpio.install +++ b/zfs.initcpio.install @@ -9,8 +9,7 @@ build() { zfs \ zpios \ spl \ - splat \ - zlib_deflate + splat map add_binary \ arcstat.py \ |