summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOmar Vega Ramos <ovruni@gnu.org.pe>2016-05-02 13:56:56 -0500
committerOmar Vega Ramos <ovruni@gnu.org.pe>2016-05-02 13:56:56 -0500
commit41b9afe0372ba4bcbb33bfe29eed244592b4b1d1 (patch)
tree8bf9d1202a039353493c9ea12bd322744557277a
parent21e92e6ea910fd32cb6f6ee28621d489981fd76c (diff)
downloadabslibre-41b9afe0372ba4bcbb33bfe29eed244592b4b1d1.tar.gz
abslibre-41b9afe0372ba4bcbb33bfe29eed244592b4b1d1.tar.bz2
abslibre-41b9afe0372ba4bcbb33bfe29eed244592b4b1d1.zip
Removing zfs-utils-git. Use zfs-utils instead
-rw-r--r--pcr/zfs-dkms/PKGBUILD78
-rw-r--r--pcr/zfs-dkms/zfs.bash-completion-r1 (renamed from pcr/zfs-utils-git/zfs-utils.bash-completion-r1)0
-rw-r--r--pcr/zfs-dkms/zfs.initcpio.hook (renamed from pcr/zfs-utils-git/zfs-utils.initcpio.hook)0
-rw-r--r--pcr/zfs-dkms/zfs.initcpio.install (renamed from pcr/zfs-utils-git/zfs-utils.initcpio.install)0
-rw-r--r--pcr/zfs-utils-git/PKGBUILD64
5 files changed, 78 insertions, 64 deletions
diff --git a/pcr/zfs-dkms/PKGBUILD b/pcr/zfs-dkms/PKGBUILD
new file mode 100644
index 000000000..455300a0a
--- /dev/null
+++ b/pcr/zfs-dkms/PKGBUILD
@@ -0,0 +1,78 @@
+#
+# Maintainer (Arch): Iacopo Isimbaldi <isiachi@rhye.it>
+# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
+#
+
+pkgbase="zfs-dkms"
+pkgname=("zfs-dkms" "zfs-utils")
+pkgver=0.6.5.6
+pkgrel=2
+license=('CDDL')
+makedepends=("git" "spl-dkms=${pkgver}")
+arch=("i686" "x86_64")
+url="http://zfsonlinux.org/"
+source=("git+https://github.com/zfsonlinux/zfs.git#tag=zfs-${pkgver}"
+ "zfs.bash-completion-r1"
+ "zfs.initcpio.install"
+ "zfs.initcpio.hook")
+sha256sums=('SKIP'
+ 'b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540'
+ '1e20071fa61a33874505dae0f2d71bb560f43e7faaea735cbde770ea10c133df'
+ '250f1232c464a81cc9c8b8ee05f21d752ebeebbc8614fae1c6d0bc600e816ac1')
+
+build() {
+ cd "${srcdir}/zfs"
+ ./autogen.sh
+
+ ./configure --prefix=/usr \
+ --sysconfdir=/etc \
+ --sbindir=/usr/bin \
+ --with-mounthelperdir=/usr/bin \
+ --libdir=/usr/lib \
+ --datadir=/usr/share \
+ --includedir=/usr/include \
+ --with-udevdir=/lib/udev \
+ --libexecdir=/usr/lib/zfs \
+ --with-config=user
+ make
+}
+
+package_zfs-dkms() {
+ pkgdesc="Kernel modules for the Zettabyte File System."
+ depends=("spl-dkms=${pkgver}" "zfs-utils=${pkgver}-${pkgrel}" "dkms")
+ provides=("zfs")
+ conflicts=("zfs-git" "zfs-lts")
+
+ dkmsdir="${pkgdir}/usr/src/zfs-${pkgver}"
+ install -d "${dkmsdir}"
+ 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 .
+}
+
+package_zfs-utils() {
+ pkgdesc="Kernel module support files for the Zettabyte File System."
+ conflicts=("zfs-utils-git" "zfs-utils-lts")
+
+ cd "${srcdir}/zfs"
+ make DESTDIR="${pkgdir}" install
+
+ # 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.initcpio.hook "${pkgdir}"/usr/lib/initcpio/hooks/zfs
+ install -D -m644 "${srcdir}"/zfs.initcpio.install "${pkgdir}"/usr/lib/initcpio/install/zfs
+ install -D -m644 "${srcdir}"/zfs.bash-completion-r1 "${pkgdir}"/usr/share/bash-completion/completions/zfs
+
+ mkdir -p "${pkgdir}"/usr/lib/initcpio/install
+}
diff --git a/pcr/zfs-utils-git/zfs-utils.bash-completion-r1 b/pcr/zfs-dkms/zfs.bash-completion-r1
index b1aded368..b1aded368 100644
--- a/pcr/zfs-utils-git/zfs-utils.bash-completion-r1
+++ b/pcr/zfs-dkms/zfs.bash-completion-r1
diff --git a/pcr/zfs-utils-git/zfs-utils.initcpio.hook b/pcr/zfs-dkms/zfs.initcpio.hook
index 3a928944d..3a928944d 100644
--- a/pcr/zfs-utils-git/zfs-utils.initcpio.hook
+++ b/pcr/zfs-dkms/zfs.initcpio.hook
diff --git a/pcr/zfs-utils-git/zfs-utils.initcpio.install b/pcr/zfs-dkms/zfs.initcpio.install
index c128d1006..c128d1006 100644
--- a/pcr/zfs-utils-git/zfs-utils.initcpio.install
+++ b/pcr/zfs-dkms/zfs.initcpio.install
diff --git a/pcr/zfs-utils-git/PKGBUILD b/pcr/zfs-utils-git/PKGBUILD
deleted file mode 100644
index dc032e2c5..000000000
--- a/pcr/zfs-utils-git/PKGBUILD
+++ /dev/null
@@ -1,64 +0,0 @@
-# Maintainer (Arch): Jesus Alvarez <jeezusjr at gmail dot com>
-# Contributor (Arch): Kyle Fuller <inbox at kylefuller dot co dot uk>
-# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
-#
-# This PKGBUILD was generated by the archzfs build scripts located at
-#
-# http://github.com/demizer/archzfs
-#
-# The build script generates and updates the pkgver and _kernel* variables.
-#
-pkgname="zfs-utils-git"
-pkgver=0.6.4.2_r0_g44b5ec8_4.1.6_1
-pkgrel=1
-license=('CDDL')
-pkgdesc="Kernel module support files for the Zettabyte File System."
-depends=("spl-git")
-makedepends=("git")
-arch=("i686" "x86_64")
-url="http://zfsonlinux.org/"
-source=("git+https://github.com/zfsonlinux/zfs.git#commit=44b5ec8f"
- "zfs-utils.bash-completion-r1"
- "zfs-utils.initcpio.install"
- "zfs-utils.initcpio.hook")
-groups=("archzfs-git")
-md5sums=('SKIP'
- '9ddb0c8a94861f929d0fa741fdc49950'
- '9ef4841abb85dee611828cc7e6f5c6fe'
- '62ba32c6853c315ff231c396cf8bfdbb')
-replaces=("zfs-utils")
-provides=("zfs-utils")
-conflicts=("zfs-utils" "zfs-utils-lts")
-
-build() {
- cd "${srcdir}/zfs"
- ./autogen.sh
-
- ./configure --prefix=/usr \
- --sysconfdir=/etc \
- --sbindir=/usr/bin \
- --libdir=/usr/lib \
- --datadir=/usr/share \
- --includedir=/usr/include \
- --with-udevdir=/lib/udev \
- --libexecdir=/usr/lib/zfs \
- --with-config=user
- make
-}
-
-package() {
- cd "${srcdir}/zfs"
- make DESTDIR="${pkgdir}" install
-
- # Remove uneeded files
- rm -r "${pkgdir}"/etc/init.d
- rm -r "${pkgdir}"/usr/lib/dracut
-
- # 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
-}