From 8f9f7d54b520e920d1561a49b76ee092f6c13d4f Mon Sep 17 00:00:00 2001 From: Iacopo Isimbaldi Date: Thu, 28 Apr 2016 21:03:49 +0100 Subject: Updated to pkgrel 2 Back to git source --- .SRCINFO | 11 ++++++----- PKGBUILD | 18 +++++++++--------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 30fcb61..2f3aaf3 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,18 +1,19 @@ # Generated by mksrcinfo v8 -# Thu Mar 24 12:11:33 UTC 2016 +# Thu Apr 28 20:03:38 UTC 2016 pkgbase = zfs-dkms pkgver = 0.6.5.6 - pkgrel = 1 + pkgrel = 2 url = http://zfsonlinux.org/ arch = i686 arch = x86_64 license = CDDL + makedepends = git 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 + source = git+https://github.com/zfsonlinux/zfs.git#tag=zfs-0.6.5.6 source = zfs.bash-completion-r1 source = zfs.initcpio.install source = zfs.initcpio.hook - sha256sums = c349d46d86b4f61cd53a0891acad916cfc3f0d6754127db7f60a0bd98185aeff + sha256sums = SKIP sha256sums = b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540 sha256sums = 1e20071fa61a33874505dae0f2d71bb560f43e7faaea735cbde770ea10c133df sha256sums = 250f1232c464a81cc9c8b8ee05f21d752ebeebbc8614fae1c6d0bc600e816ac1 @@ -20,7 +21,7 @@ pkgbase = zfs-dkms 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 + depends = zfs-utils=0.6.5.6-2 depends = dkms provides = zfs conflicts = zfs-git diff --git a/PKGBUILD b/PKGBUILD index 5b2b447..423aaaa 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,22 +5,22 @@ pkgbase="zfs-dkms" pkgname=("zfs-dkms" "zfs-utils") pkgver=0.6.5.6 -pkgrel=1 +pkgrel=2 license=('CDDL') -makedepends=("spl-dkms=${pkgver}") +makedepends=("git" "spl-dkms=${pkgver}") 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#tag=zfs-${pkgver}" "zfs.bash-completion-r1" "zfs.initcpio.install" "zfs.initcpio.hook") -sha256sums=('c349d46d86b4f61cd53a0891acad916cfc3f0d6754127db7f60a0bd98185aeff' +sha256sums=('SKIP' 'b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540' '1e20071fa61a33874505dae0f2d71bb560f43e7faaea735cbde770ea10c133df' '250f1232c464a81cc9c8b8ee05f21d752ebeebbc8614fae1c6d0bc600e816ac1') build() { - cd "${srcdir}/zfs-${pkgver}" + cd "${srcdir}/zfs" ./autogen.sh ./configure --prefix=/usr \ @@ -44,11 +44,11 @@ package_zfs-dkms() { dkmsdir="${pkgdir}/usr/src/zfs-${pkgver}" install -d "${dkmsdir}" - - cd "${srcdir}" - tar -xzf "zfs-${pkgver}.tar.gz" -C "${dkmsdir}" --strip-components 1 + cp -a ${srcdir}/zfs/. ${dkmsdir} cd "${dkmsdir}" + make clean distclean + find . -name ".git*" -print0 | xargs -0 rm -fr -- scripts/dkms.mkconf -v ${pkgver} -f dkms.conf -n zfs chmod g-w,o-w -R . } @@ -57,7 +57,7 @@ package_zfs-utils() { pkgdesc="Kernel module support files for the Zettabyte File System." conflicts=("zfs-utils-git" "zfs-utils-lts") - cd "${srcdir}/zfs-${pkgver}" + cd "${srcdir}/zfs" make DESTDIR="${pkgdir}" install # Remove uneeded files -- cgit v1.2.1