From c38f1dcfc96295e73a50e8d068fb7a11e7cf0705 Mon Sep 17 00:00:00 2001
From: Carlo Landmeter <clandmeter@gmail.com>
Date: Fri, 20 May 2016 17:52:48 +0200
Subject: testing/spl-grsec: move userland to spl pkg

---
 testing/spl-grsec/APKBUILD | 43 +++++++++++++------------------------------
 1 file changed, 13 insertions(+), 30 deletions(-)

(limited to 'testing')

diff --git a/testing/spl-grsec/APKBUILD b/testing/spl-grsec/APKBUILD
index 84fd76bf56..c0591b1e91 100644
--- a/testing/spl-grsec/APKBUILD
+++ b/testing/spl-grsec/APKBUILD
@@ -9,7 +9,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
@@ -30,57 +30,40 @@ arch="x86 x86_64"
 license="GPL"
 depends=""
 depends_dev="linux-grsec-dev=$_kernelver"
-makedepends="$depends_dev perl automake autoconf libtool linux-headers"
+makedepends="$depends_dev linux-headers"
 install=""
-subpackages="$pkgname-dev $pkgname-doc spl-utils:utils"
-source="http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-$_realver.tar.gz
-"
+subpackages="$pkgname-dev"
+source="http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-$_realver.tar.gz"
 
-_builddir="$srcdir"/spl-$_realver
+builddir="$srcdir"/spl-$_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
+	# do not remove as it sources other prepare
+	default_prepare
 }
 
 build() {
-	cd "$_builddir"
-	./autogen.sh || return 1
+	cd "$builddir"
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
 		--localstatedir=/var \
-		--with-config=all \
+		--with-config=kernel \
 		--with-linux=/usr/src/linux-headers-${_abi_release} \
 		|| return 1
 	make || return 1
 }
 
 package() {
-        cd "$_builddir"
+        cd "$builddir"
         make DESTDIR="$pkgdir" install || return 1
 }
 
 dev() {
-        mkdir -p "$subpkgdir"/usr
-        mv "$pkgdir"/usr/src \
-                "$subpkgdir"/usr || return 1
-        default_dev
-}
-
-utils() {
-        pkgdesc="Userspace spl tools"
-        mkdir -p "$subpkgdir"
-        mv "$pkgdir"/* "$subpkgdir" || return 1
-        mkdir -p "$pkgdir"/lib
-        mv "$subpkgdir"/lib/modules \
-                "$pkgdir"/lib/ || return 1
+	mkdir -p "$subpkgdir"/usr
+	mv "$pkgdir"/usr/src  "$subpkgdir"/usr
+	default_dev
 }
 
 md5sums="4e6866cea182d25f2ecab1fb7201316a  spl-0.6.5.7.tar.gz"
-- 
cgit v1.2.3