From a8fe31ad9e06b312b24d2d65b3844b971f3c2c94 Mon Sep 17 00:00:00 2001
From: Carlo Landmeter <clandmeter@gmail.com>
Date: Sat, 21 May 2016 09:08:19 +0200
Subject: testing/zfs-grsec: move userland to zfs pkg

---
 testing/zfs-grsec/APKBUILD | 43 ++++++++++++-------------------------------
 1 file changed, 12 insertions(+), 31 deletions(-)

(limited to 'testing/zfs-grsec')

diff --git a/testing/zfs-grsec/APKBUILD b/testing/zfs-grsec/APKBUILD
index 328b19fe60..8bf7dab464 100644
--- a/testing/zfs-grsec/APKBUILD
+++ b/testing/zfs-grsec/APKBUILD
@@ -1,5 +1,5 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer:
+# Maintainer: Carlo Landmeter <clandmeter@gmail.com>
 
 _flavor=${FLAVOR:-grsec}
 _realname=zfs
@@ -10,7 +10,7 @@ _kver=4.4.11
 _kpkgrel=0
 
 _realver=0.6.5.7
-_mypkgrel=1
+_mypkgrel=2
 
 # source the kernel version
 if [ -f ../../main/linux-$_flavor/APKBUILD ]; then
@@ -33,8 +33,9 @@ depends="spl-$_flavor"
 depends_dev="glib-dev e2fsprogs-dev util-linux-dev libtirpc-dev
 	linux-$_flavor-dev=$_kernelver spl-$_flavor-dev"
 makedepends="$depends_dev automake autoconf libtool linux-headers"
+install_if="zfs linux-grsec-$_kernelver"
 install=""
-subpackages="$pkgname-dev $pkgname-doc zfs-utils:utils"
+subpackages="$pkgname-dev"
 source="http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-$_realver.tar.gz
 	0001-Add-support-for-alpine-linux.patch
 
@@ -50,21 +51,15 @@ source="http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-$_realver.tar
 	"
 
 
-_builddir="$srcdir/$_realname-$_realver"
+builddir="$srcdir/$_realname-$_realver"
 
 prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
+	default_prepare
 	autoreconf -vif || return 1
 }
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	export LIBS="$LIBS -lintl"
 	./configure --prefix=/usr \
 		--with-tirpc \
@@ -72,8 +67,7 @@ build() {
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--localstatedir=/var \
-		--with-config=all \
-		--with-udevdir=/lib/udev \
+		--with-config=kernel \
 		--with-linux=/usr/src/linux-headers-${_abi_release} \
 		--with-spl=/usr/src/spl-${_realver} \
 		|| return 1
@@ -81,29 +75,16 @@ build() {
 }
 
 package() {
-        cd "$_builddir"
-        make DESTDIR="$pkgdir" install || return 1
-        rm -rf "$pkgdir"/usr/libexec
-        rm -rf "$pkgdir"/usr/share/dracut
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install || return 1
 }
 
 dev() {
-        mkdir -p "$subpkgdir"/usr
-        mv "$pkgdir"/usr/src \
-                "$subpkgdir"/usr || return 1
+	mkdir -p "$subpkgdir"/usr
+	mv "$pkgdir"/usr/src "$subpkgdir"/usr || return 1
         default_dev
 }
 
-utils() {
-        pkgdesc="Userland tools to manage zfs on linux"
-        depends="bash"
-        mkdir -p "$subpkgdir"
-        mv "$pkgdir"/* "$subpkgdir" || return 1
-        mkdir -p "$pkgdir"/lib
-        mv "$subpkgdir"/lib/modules \
-                "$pkgdir"/lib || return 1
-}
-
 md5sums="b470c0426da6e1e3513f5166c907218d  zfs-0.6.5.7.tar.gz
 ce98b83e44621e99e686cb384b36aaeb  0001-Add-support-for-alpine-linux.patch
 7b4ee1de2404c0baa9848de309819fc9  0001-Add-missing-fcntl.h-to-includes-in-mount_zfs.c.patch
-- 
cgit v1.2.3