summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorIacopo Isimbaldi2015-08-08 18:14:14 +0200
committerIacopo Isimbaldi2015-08-08 18:14:14 +0200
commit0e008d86b030338900f66f5c12dfe31cfc167341 (patch)
tree2487b901a01eeb38cfb3fe8ffe5c5d49249c1eef
parentcf36155b4453a450ac95f96914c46f0bb4194e05 (diff)
downloadaur-0e008d86b030338900f66f5c12dfe31cfc167341.tar.gz
Dropped "-git" suffix
-rw-r--r--.SRCINFO20
-rw-r--r--PKGBUILD22
-rw-r--r--zfs.install6
3 files changed, 27 insertions, 21 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 82d9efb34ee..d34922f7272 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,4 +1,4 @@
-pkgbase = zfs-dkms-git
+pkgbase = zfs-dkms
pkgver = 0.6.4.2
pkgrel = 1
url = http://zfsonlinux.org/
@@ -15,18 +15,22 @@ pkgbase = zfs-dkms-git
md5sums = 9ef4841abb85dee611828cc7e6f5c6fe
md5sums = 62ba32c6853c315ff231c396cf8bfdbb
-pkgname = zfs-dkms-git
+pkgname = zfs-dkms
pkgdesc = Kernel modules for the Zettabyte File System.
install = zfs.install
- depends = spl-dkms-git=0.6.4.2-1
- depends = zfs-utils-dkms-git=0.6.4.2-1
+ depends = spl-dkms=0.6.4.2-1
+ depends = zfs-utils=0.6.4.2-1
depends = dkms
- provides = zfs-git
+ provides = zfs
+ conflicts = zfs-git
conflicts = zfs-lts
+ replaces = zfs-dkms-git
-pkgname = zfs-utils-dkms-git
+pkgname = zfs-utils
pkgdesc = Kernel module support files for the Zettabyte File System.
- depends = spl-dkms-git=0.6.4.2-1
- provides = zfs-utils-git
+ depends = spl-dkms=0.6.4.2-1
+ provides = zfs-utils
+ conflicts = zfs-utils-git
conflicts = zfs-utils-lts
+ replaces = zfs-utils-dkms-git
diff --git a/PKGBUILD b/PKGBUILD
index 479d70e3c18..281e69b296c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
# Maintainer: isiachi <isiachi@rhyeworld.it>
#
-pkgbase="zfs-dkms-git"
-pkgname=("zfs-dkms-git" "zfs-utils-dkms-git")
+pkgbase="zfs-dkms"
+pkgname=("zfs-dkms" "zfs-utils")
pkgver=0.6.4.2
pkgrel=1
license=('CDDL')
@@ -46,11 +46,12 @@ build() {
make
}
-package_zfs-dkms-git() {
+package_zfs-dkms() {
pkgdesc="Kernel modules for the Zettabyte File System."
- depends=("spl-dkms-git=${pkgver}-${pkgrel}" "zfs-utils-dkms-git=${pkgver}-${pkgrel}" "dkms")
- provides=("zfs-git")
- conflicts=("zfs-lts")
+ depends=("spl-dkms=${pkgver}-${pkgrel}" "zfs-utils=${pkgver}-${pkgrel}" "dkms")
+ provides=("zfs")
+ conflicts=("zfs-git" "zfs-lts")
+ replaces=("zfs-dkms-git")
install=zfs.install
install -d ${pkgdir}/usr/src
@@ -59,11 +60,12 @@ package_zfs-dkms-git() {
rm -f ${pkgdir}/usr/src/zfs-${_dirver}/.gitignore
}
-package_zfs-utils-dkms-git() {
+package_zfs-utils() {
pkgdesc="Kernel module support files for the Zettabyte File System."
- depends=("spl-dkms-git=${pkgver}-${pkgrel}")
- provides=("zfs-utils-git")
- conflicts=("zfs-utils-lts")
+ depends=("spl-dkms=${pkgver}-${pkgrel}")
+ provides=("zfs-utils")
+ conflicts=("zfs-utils-git" "zfs-utils-lts")
+ replaces=("zfs-utils-dkms-git")
cd "${srcdir}/zfs"
make DESTDIR="${pkgdir}" install
diff --git a/zfs.install b/zfs.install
index 37c0f534d90..77a97982035 100644
--- a/zfs.install
+++ b/zfs.install
@@ -8,9 +8,9 @@ post_upgrade() {
check_initramfs() {
echo " >>> To build the module for the current kernel use this command:
- # dkms install zfs/0.6.4 -k _KERNEL_VERSION_HERE_
- or just boot to kernel you want to built and do
- # dkms install zfs/0.6.4 -k \$(uname -r)
+ # dkms install zfs/0.6.4.2 -k _KERNEL_VERSION_HERE_
+ or just boot to kernel you want to build and do
+ # dkms install zfs/0.6.4.2 -k \$(uname -r)
>>> Always remember to install kernel headers!
"