diff options
| -rw-r--r-- | .SRCINFO | 28 | ||||
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | PKGBUILD | 44 |
3 files changed, 42 insertions, 32 deletions
@@ -1,33 +1,37 @@ # Generated by mksrcinfo v8 -# Thu Mar 24 12:11:33 UTC 2016 -pkgbase = zfs-dkms - pkgver = 0.6.5.6 +# Thu Mar 24 12:21:13 UTC 2016 +pkgbase = zfs-dkms-git + pkgver = 0.6.5_r189_g541a090 pkgrel = 1 url = http://zfsonlinux.org/ arch = i686 arch = x86_64 license = CDDL - makedepends = spl-dkms=0.6.5.6 - source = https://github.com/zfsonlinux/zfs/releases/download/zfs-0.6.5.6/zfs-0.6.5.6.tar.gz + makedepends = git + 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 - sha256sums = c349d46d86b4f61cd53a0891acad916cfc3f0d6754127db7f60a0bd98185aeff + sha256sums = SKIP sha256sums = b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540 sha256sums = 1e20071fa61a33874505dae0f2d71bb560f43e7faaea735cbde770ea10c133df sha256sums = 250f1232c464a81cc9c8b8ee05f21d752ebeebbc8614fae1c6d0bc600e816ac1 -pkgname = zfs-dkms - pkgdesc = Kernel modules for the Zettabyte File System. - depends = spl-dkms=0.6.5.6 - depends = zfs-utils=0.6.5.6-1 +pkgname = zfs-dkms-git + pkgdesc = Kernel modules for the Zettabyte File System. (Git version) + depends = spl-dkms-git + depends = zfs-utils-dkms-git=0.6.5_r189_g541a090-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,25 +2,30 @@ # Maintainer: Iacopo Isimbaldi <isiachi@rhye.it> # -pkgbase="zfs-dkms" -pkgname=("zfs-dkms" "zfs-utils") -pkgver=0.6.5.6 +pkgbase="zfs-dkms-git" +pkgname=("zfs-dkms-git" "zfs-utils-dkms-git") +pkgver=0.6.5_r189_g541a090 pkgrel=1 license=('CDDL') -makedepends=("spl-dkms=${pkgver}") +makedepends=("git" "spl-dkms-git") arch=("i686" "x86_64") url="http://zfsonlinux.org/" -source=("https://github.com/zfsonlinux/zfs/releases/download/zfs-${pkgver}/zfs-${pkgver}.tar.gz" +source=("git+https://github.com/zfsonlinux/zfs.git" "zfs.bash-completion-r1" "zfs.initcpio.install" "zfs.initcpio.hook") -sha256sums=('c349d46d86b4f61cd53a0891acad916cfc3f0d6754127db7f60a0bd98185aeff' +sha256sums=('SKIP' 'b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540' '1e20071fa61a33874505dae0f2d71bb560f43e7faaea735cbde770ea10c133df' '250f1232c464a81cc9c8b8ee05f21d752ebeebbc8614fae1c6d0bc600e816ac1') +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-${pkgver}" + cd "${srcdir}/zfs" ./autogen.sh ./configure --prefix=/usr \ @@ -36,28 +41,29 @@ 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}" - cd "${srcdir}" - tar -xzf "zfs-${pkgver}.tar.gz" -C "${dkmsdir}" --strip-components 1 + cd "${srcdir}/zfs" + git archive --format=tar HEAD | tar -x -C "${dkmsdir}" cd "${dkmsdir}" - 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-${pkgver}" + cd "${srcdir}/zfs" make DESTDIR="${pkgdir}" install # Remove uneeded files |