diff options
author | Iacopo Isimbaldi <isiachi@rhye.it> | 2016-01-12 00:33:57 +0100 |
---|---|---|
committer | Iacopo Isimbaldi <isiachi@rhye.it> | 2016-01-12 00:33:57 +0100 |
commit | 0ba6edb7bed65c8cea724c5b1cc9cceed1a0d268 (patch) | |
tree | 46a0c6d7963823bfe58e5d0eb5d4d8c3e17ce5de /PKGBUILD | |
parent | Revert "remove autogen.sh call" (diff) | |
parent | Bump to pkgrel 3 (diff) | |
download | zfs-dkms-0ba6edb7bed65c8cea724c5b1cc9cceed1a0d268.tar.xz |
Merge branch 'dev'
Diffstat (limited to 'PKGBUILD')
-rw-r--r-- | PKGBUILD | 22 |
1 files changed, 12 insertions, 10 deletions
@@ -6,18 +6,18 @@ pkgbase="zfs-dkms" pkgname=("zfs-dkms" "zfs-utils") pkgver=0.6.5.4 -pkgrel=2 +pkgrel=3 license=('CDDL') makedepends=("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" - "zfs-utils.bash-completion-r1" - "zfs-utils.initcpio.install" - "zfs-utils.initcpio.hook") + "zfs.bash-completion-r1" + "zfs.initcpio.install" + "zfs.initcpio.hook") sha256sums=('780862ec2301ccace412a324787e9df762cff6046e73e2ac0ebdce9e2bd59b0f' 'b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540' - '1e20071fa61a33874505dae0f2d71bb560f43e7faaea735cbde770ea10c133df' + '70930eee5b0f55ba587220b9530170d91ef1eea98a37de9ae38f963dee410b3a' '250f1232c464a81cc9c8b8ee05f21d752ebeebbc8614fae1c6d0bc600e816ac1') build() { @@ -40,7 +40,6 @@ build() { package_zfs-dkms() { pkgdesc="Kernel modules for the Zettabyte File System." depends=("spl-dkms=${pkgver}" "zfs-utils=${pkgver}-${pkgrel}" "dkms") - optdepends=("mkinitcpio-dkms: Generate initramfs with zfs modules automatically") provides=("zfs") conflicts=("zfs-git" "zfs-lts") install=zfs.install @@ -52,7 +51,6 @@ package_zfs-dkms() { tar -xzf "zfs-${pkgver}.tar.gz" -C "${dkmsdir}" --strip-components 1 cd "${dkmsdir}" - ./autogen.sh scripts/dkms.mkconf -v ${pkgver} -f dkms.conf -n zfs chmod g-w,o-w -R . } @@ -67,12 +65,16 @@ package_zfs-utils() { # Remove uneeded files rm -r "${pkgdir}"/etc/init.d rm -r "${pkgdir}"/usr/lib/dracut + rm -r "${pkgdir}"/usr/share/initramfs-tools # move module tree /lib -> /usr/lib cp -r "${pkgdir}"/{lib,usr} rm -r "${pkgdir}"/lib - 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 - install -D -m644 "${srcdir}"/zfs-utils.bash-completion-r1 "${pkgdir}"/usr/share/bash-completion/completions/zfs + install -D -m644 "${srcdir}"/zfs.initcpio.hook "${pkgdir}"/usr/lib/initcpio/hooks/zfs + install -D -m644 "${srcdir}"/zfs.bash-completion-r1 "${pkgdir}"/usr/share/bash-completion/completions/zfs + + mkdir -p "${pkgdir}"/usr/lib/initcpio/install + sed -e "s|##VERMARKER##|${pkgver}|" "${srcdir}"/zfs.initcpio.install > "${pkgdir}"/usr/lib/initcpio/install/zfs + chmod 644 "${pkgdir}"/usr/lib/initcpio/install/zfs } |