summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBin Jin2015-12-30 05:01:00 +0100
committerBin Jin2015-12-30 05:01:00 +0100
commitf5248071241595023c82d77cc2ba3c0d716d13d2 (patch)
tree78fc52bc76c75a921a92289cf4e5e3e884ef101c
parent38e86df1a4df12b7b00f54f8e1c8af72e6d78c9a (diff)
downloadaur-f5248071241595023c82d77cc2ba3c0d716d13d2.tar.gz
Revert "Bump to PKGREL 5"
This reverts commit fa739bc7730253a0dca26ddb377e07173a327fd7.
-rw-r--r--.SRCINFO13
-rw-r--r--PKGBUILD13
2 files changed, 14 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3932b08a10fe..03f879efa417 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,6 @@
-# Generated by mksrcinfo v8
-# Tue Dec 29 14:06:55 UTC 2015
pkgbase = zfs-dkms-git
pkgver = 0.6.5.3_r0_g9aaf60b
- pkgrel = 5
+ pkgrel = 4
url = http://zfsonlinux.org/
arch = i686
arch = x86_64
@@ -21,16 +19,19 @@ pkgbase = zfs-dkms-git
pkgname = zfs-dkms-git
pkgdesc = Kernel modules for the Zettabyte File System.
install = zfs.install
- depends = spl-dkms-git=0.6.5.3_r0_g7e85f6b
- depends = zfs-utils-dkms-git=0.6.5.3_r0_g9aaf60b-5
+ depends = spl-dkms=0.6.5.3
+ depends = zfs-utils-dkms-git=0.6.5.3_r0_g9aaf60b-4
depends = dkms
+ optdepends = mkinitcpio-dkms: Generate initramfs with zfs modules automatically
+ provides = zfs-dkms=0.6.5.3
conflicts = zfs-git
conflicts = zfs-lts
conflicts = zfs-dkms
pkgname = zfs-utils-dkms-git
pkgdesc = Kernel module support files for the Zettabyte File System.
- depends = spl-dkms-git=0.6.5.3_r0_g7e85f6b
+ depends = spl-dkms-git
+ provides = zfs-utils
conflicts = zfs-utils-git
conflicts = zfs-utils-lts
conflicts = zfs-utils
diff --git a/PKGBUILD b/PKGBUILD
index a4a5d5e50b5c..c2333e0124c7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,12 @@
#
# Maintainer: bjin <bjin1990 at gmail dot com>
-# Maintainer: Iacopo Isimbaldi <isiachi@rhye.it>
+# Contributor: isiachi <isiachi@rhyeworld.it>
#
pkgbase="zfs-dkms-git"
pkgname=("zfs-dkms-git" "zfs-utils-dkms-git")
pkgver=0.6.5.3_r0_g9aaf60b
-pkgrel=5
+pkgrel=4
license=('CDDL')
makedepends=("git" "tar")
arch=("i686" "x86_64")
@@ -20,8 +20,6 @@ md5sums=('SKIP'
'9ef4841abb85dee611828cc7e6f5c6fe'
'62ba32c6853c315ff231c396cf8bfdbb')
-_splver=0.6.5.3_r0_g7e85f6b
-
pkgver() {
cd "${srcdir}/zfs"
git describe --match "zfs-*" --long --tags | sed -e 's|zfs-||' -e 's|-\([0-9]*-g\)|-r\1|' -e 's|[-: ]|_|g'
@@ -46,7 +44,9 @@ build() {
package_zfs-dkms-git() {
pkgdesc="Kernel modules for the Zettabyte File System."
- depends=("spl-dkms-git=${_splver}" "zfs-utils-dkms-git=${pkgver}-${pkgrel}" "dkms")
+ depends=("spl-dkms=${pkgver%%_*}" "zfs-utils-dkms-git=${pkgver}-${pkgrel}" "dkms")
+ optdepends=("mkinitcpio-dkms: Generate initramfs with zfs modules automatically")
+ provides=("zfs-dkms=${pkgver%%_*}")
conflicts=("zfs-git" "zfs-lts" "zfs-dkms")
install=zfs.install
@@ -64,7 +64,8 @@ package_zfs-dkms-git() {
package_zfs-utils-dkms-git() {
pkgdesc="Kernel module support files for the Zettabyte File System."
- depends=("spl-dkms-git=${_splver}")
+ depends=("spl-dkms-git")
+ provides=("zfs-utils")
conflicts=("zfs-utils-git" "zfs-utils-lts" "zfs-utils")
cd "${srcdir}/zfs"