Split utils

2 files changed, 3 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5c070a9e4998..2ac108461efc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -12,7 +12,7 @@ pkgbase = zfs-dkms-git
 	source = zfs-utils.initcpio.hook
 	sha256sums = SKIP
 	sha256sums = b60214f70ffffb62ffe489cbfabd2e069d14ed2a391fac0e36f914238394b540
-	sha256sums = e33adabbe3f2f4866802c9d63c7810c7a42b4df2288d0cdd23376519b15b36e4
+	sha256sums = 335e309ebf5b74fd8956f5e8805939c37d4008b0bcc3b00be6e7ef1d5b7c1669
 	sha256sums = 290b18f538badce2eedd4ac4926a579535ec6c887436569fa6ff3685b55776bf
 
 pkgname = zfs-dkms-git
@@ -28,18 +28,3 @@ pkgname = zfs-dkms-git
 	conflicts = spl-dkms-git
 	replaces = spl-dkms-git
 
-pkgname = zfs-utils-git
-	pkgdesc = Kernel module support files for the Zettabyte File System. (Git version)
-	install = zfs-utils.install
-	provides = zfs-utils
-	provides = spl-utils
-	conflicts = zfs-utils-dkms-git
-	conflicts = zfs-utils
-	conflicts = zfs-utils-common-git
-	conflicts = zfs-utils-common
-	conflicts = spl-utils-dkms-git
-	replaces = zfs-utils-dkms-git
-	replaces = spl-utils-dkms-git
-	backup = etc/zfs/zed.d/zed.rc
-	backup = etc/default/zfs
-
diff --git a/PKGBUILD b/PKGBUILD
index 833699db348b..6ae0036409a1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Iacopo Isimbaldi <isiachi@rhye.it>
 
 pkgbase="zfs-dkms-git"
-pkgname=("zfs-dkms-git" "zfs-utils-git")
+pkgname=("zfs-dkms-git")
 pkgver=0.7.0_r1575_g93491c4bb
 pkgrel=1
 license=('CDDL')
@@ -41,7 +41,7 @@ build() {
     make
 }
 
-package_zfs-dkms-git() {
+package() {
     pkgdesc="Kernel modules for the Zettabyte File System. (Git version)"
     depends=("zfs-utils-git=${pkgver}-${pkgrel}" "dkms" "lsb-release")
     provides=("zfs" "spl")
@@ -59,27 +59,3 @@ package_zfs-dkms-git() {
     scripts/dkms.mkconf -v ${pkgver%%_*} -f dkms.conf -n zfs
     chmod g-w,o-w -R .
 }
-
-package_zfs-utils-git() {
-    pkgdesc="Kernel module support files for the Zettabyte File System. (Git version)"
-    provides=("zfs-utils" "spl-utils")
-    replaces=("zfs-utils-dkms-git" "spl-utils-dkms-git")
-    conflicts=("zfs-utils-dkms-git" "zfs-utils" "zfs-utils-common-git" "zfs-utils-common" "spl-utils-dkms-git")
-    install=zfs-utils.install
-    backup=('etc/zfs/zed.d/zed.rc' 'etc/default/zfs')
-
-    cd "${srcdir}/zfs"
-    make DESTDIR="${pkgdir}" install
-    # Remove uneeded files
-    rm -r "${pkgdir}"/etc/init.d
-    rm -r "${pkgdir}"/usr/lib/dracut
-    # Autoload the zfs module at boot
-    mkdir -p "${pkgdir}/etc/modules-load.d"
-    printf "%s\n" "zfs" > "${pkgdir}/etc/modules-load.d/zfs.conf"
-    # fix permissions
-    chmod 750 ${pkgdir}/etc/sudoers.d
-    # Install the support files
-    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
-}