diff options
-rw-r--r-- | PKGBUILD | 43 | ||||
-rw-r--r-- | zfs.install | 18 |
2 files changed, 28 insertions, 33 deletions
@@ -1,16 +1,17 @@ # -# Maintainer: isiachi <isiachi@rhyeworld.it> +# Maintainer: bjin <bjin1990 at gmail dot com> +# Contributor: isiachi <isiachi@rhyeworld.it> # pkgbase="zfs-dkms-git" pkgname=("zfs-dkms-git" "zfs-utils-dkms-git") -pkgver=0.6.4.2 +pkgver=0.6.5.2_0_g0b7b4bd pkgrel=1 license=('CDDL') makedepends=("git") arch=("i686" "x86_64") url="http://zfsonlinux.org/" -source=("git+https://github.com/zfsonlinux/zfs.git" +source=("git+https://github.com/zfsonlinux/zfs.git#tag=zfs-0.6.5.2" "zfs-utils.bash-completion-r1" "zfs-utils.initcpio.install" "zfs-utils.initcpio.hook") @@ -18,22 +19,17 @@ md5sums=('SKIP' '9ddb0c8a94861f929d0fa741fdc49950' '9ef4841abb85dee611828cc7e6f5c6fe' '62ba32c6853c315ff231c396cf8bfdbb') -#install=zfs.install -_dirver="${pkgver}" -_gittag="zfs-${pkgver}" - -prepare() { +pkgver() { cd "${srcdir}/zfs" - - git checkout ${_gittag} + git describe --match "zfs-*" --long --tags | sed -e 's|zfs-||g' -e 's|[-: ]|_|g' } build() { cd "${srcdir}/zfs" ./autogen.sh - scripts/dkms.mkconf -v ${_dirver} -f dkms.conf -n zfs - + scripts/dkms.mkconf -v ${pkgver%%_*} -f dkms.conf -n zfs + ./configure --prefix=/usr \ --sysconfdir=/etc \ --sbindir=/usr/bin \ @@ -42,28 +38,30 @@ build() { --includedir=/usr/include \ --with-udevdir=/lib/udev \ --libexecdir=/usr/lib/zfs \ + --with-mounthelperdir=/usr/bin \ --with-config=user make } package_zfs-dkms-git() { 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-git" "zfs-utils-dkms-git=${pkgver}-${pkgrel}" "dkms") + provides=("zfs-dkms") + conflicts=("zfs-git" "zfs-lts" "zfs-dkms") install=zfs.install - + install -d ${pkgdir}/usr/src - cp -a ${srcdir}/zfs ${pkgdir}/usr/src/zfs-${_dirver} - rm -rf ${pkgdir}/usr/src/zfs-${_dirver}/.git - rm -f ${pkgdir}/usr/src/zfs-${_dirver}/.gitignore + cp -a ${srcdir}/zfs ${pkgdir}/usr/src/zfs-${pkgver%%_*} + cd ${pkgdir}/usr/src/zfs-${pkgver%%_*} + rm -rf .git .gitignore + make clean } package_zfs-utils-dkms-git() { 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-git") + provides=("zfs-utils") + conflicts=("zfs-utils-git" "zfs-utils-lts" "zfs-utils") cd "${srcdir}/zfs" make DESTDIR="${pkgdir}" install @@ -75,7 +73,6 @@ package_zfs-utils-dkms-git() { # move module tree /lib -> /usr/lib cp -r "${pkgdir}"/{lib,usr} rm -r "${pkgdir}"/lib - # rm -r "${pkgdir}"/sbin install -D -m644 "${srcdir}"/zfs-utils.initcpio.hook "${pkgdir}"/usr/lib/initcpio/hooks/zfs install -D -m644 "${srcdir}"/zfs-utils.initcpio.install "${pkgdir}"/usr/lib/initcpio/install/zfs diff --git a/zfs.install b/zfs.install index 37c0f534d90b..5307ea86ee8b 100644 --- a/zfs.install +++ b/zfs.install @@ -1,17 +1,15 @@ post_install() { - check_initramfs + dkms install zfs/${1%%[-_]*} } -post_upgrade() { - check_initramfs +pre_upgrade() { + pre_remove ${2%%[-_]*} } -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) +post_upgrade() { + post_install ${1%%[-_]*} +} - >>> Always remember to install kernel headers! -" +pre_remove() { + dkms remove zfs/${1%%[-_]*} --all } |