diff options
| -rw-r--r-- | .SRCINFO | 27 | ||||
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | PKGBUILD | 36 |
3 files changed, 37 insertions, 28 deletions
@@ -1,15 +1,15 @@ # Generated by mksrcinfo v8 -# Sat Aug 19 19:48:26 UTC 2017 -pkgbase = zfs-dkms - pkgver = 0.7.1 - pkgrel = 2 +# Sat Aug 19 19:50:07 UTC 2017 +pkgbase = zfs-dkms-git + pkgver = 0.7.0_r33_g08de8c16f + pkgrel = 1 url = http://zfsonlinux.org/ arch = i686 arch = x86_64 license = CDDL makedepends = git - makedepends = spl-dkms=0.7.1 - source = git+https://github.com/zfsonlinux/zfs.git#tag=zfs-0.7.1 + makedepends = spl-dkms-git + source = git+https://github.com/zfsonlinux/zfs.git source = zfs.bash-completion-r1 source = zfs.initcpio.install source = zfs.initcpio.hook @@ -18,17 +18,20 @@ pkgbase = zfs-dkms sha256sums = aa5706bf08b36209a318762680f3c9fb45b3fc4b8e4ef184c8a5370b2c3000ca sha256sums = f95ad1a5421ccbb8b01f448373f46cfd1f718361a82c2687a597325cf9827e3e -pkgname = zfs-dkms - pkgdesc = Kernel modules for the Zettabyte File System. - depends = spl-dkms=0.7.1 - depends = zfs-utils=0.7.1-2 +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_r33_g08de8c16f-1 depends = dkms provides = zfs conflicts = zfs-git conflicts = zfs-lts + conflicts = zfs-dkms -pkgname = zfs-utils - pkgdesc = Kernel module support files for the Zettabyte File System. +pkgname = zfs-utils-dkms-git + pkgdesc = Kernel module support files for the Zettabyte File System. (Git version) + provides = zfs-utils conflicts = zfs-utils-git conflicts = zfs-utils-lts + conflicts = zfs-utils diff --git a/.gitignore b/.gitignore index 5d372660dcf7..edb102fd0fb8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,7 @@ !.gitignore +/zfs /src /pkg *.pkg* *.orig -zfs-*.tar.gz @@ -2,15 +2,15 @@ # Maintainer: Iacopo Isimbaldi <isiachi@rhye.it> # -pkgbase="zfs-dkms" -pkgname=("zfs-dkms" "zfs-utils") -pkgver=0.7.1 -pkgrel=2 +pkgbase="zfs-dkms-git" +pkgname=("zfs-dkms-git" "zfs-utils-dkms-git") +pkgver=0.7.0_r33_g08de8c16f +pkgrel=1 license=('CDDL') -makedepends=("git" "spl-dkms=${pkgver}") +makedepends=("git" "spl-dkms-git") arch=("i686" "x86_64") url="http://zfsonlinux.org/" -source=("git+https://github.com/zfsonlinux/zfs.git#tag=zfs-${pkgver}" +source=("git+https://github.com/zfsonlinux/zfs.git" "zfs.bash-completion-r1" "zfs.initcpio.install" "zfs.initcpio.hook") @@ -19,6 +19,11 @@ sha256sums=('SKIP' 'aa5706bf08b36209a318762680f3c9fb45b3fc4b8e4ef184c8a5370b2c3000ca' 'f95ad1a5421ccbb8b01f448373f46cfd1f718361a82c2687a597325cf9827e3e') +pkgver() { + cd "${srcdir}/zfs" + git describe --match "zfs-*" --long --tags | sed -e 's|zfs-||' -e 's|-\([0-9]*-g\)|-r\1|' -e 's|[-: ]|_|g' +} + build() { cd "${srcdir}/zfs" ./autogen.sh @@ -36,13 +41,13 @@ build() { make } -package_zfs-dkms() { - pkgdesc="Kernel modules for the Zettabyte File System." - depends=("spl-dkms=${pkgver}" "zfs-utils=${pkgver}-${pkgrel}" "dkms") +package_zfs-dkms-git() { + pkgdesc="Kernel modules for the Zettabyte File System. (Git version)" + depends=("spl-dkms-git" "zfs-utils-dkms-git=${pkgver}-${pkgrel}" "dkms") provides=("zfs") - conflicts=("zfs-git" "zfs-lts") + conflicts=("zfs-git" "zfs-lts" "zfs-dkms") - dkmsdir="${pkgdir}/usr/src/zfs-${pkgver}" + dkmsdir="${pkgdir}/usr/src/zfs-${pkgver%%_*}" install -d "${dkmsdir}" cp -a ${srcdir}/zfs/. ${dkmsdir} @@ -50,13 +55,14 @@ package_zfs-dkms() { make clean make distclean find . -name ".git*" -print0 | xargs -0 rm -fr -- - scripts/dkms.mkconf -v ${pkgver} -f dkms.conf -n zfs + scripts/dkms.mkconf -v ${pkgver%%_*} -f dkms.conf -n zfs chmod g-w,o-w -R . } -package_zfs-utils() { - pkgdesc="Kernel module support files for the Zettabyte File System." - conflicts=("zfs-utils-git" "zfs-utils-lts") +package_zfs-utils-dkms-git() { + pkgdesc="Kernel module support files for the Zettabyte File System. (Git version)" + provides=("zfs-utils") + conflicts=("zfs-utils-git" "zfs-utils-lts" "zfs-utils") cd "${srcdir}/zfs" make DESTDIR="${pkgdir}" install |