aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarlo Landmeter <clandmeter@gmail.com>2012-11-22 17:37:17 +0100
committerCarlo Landmeter <clandmeter@gmail.com>2012-11-22 17:37:17 +0100
commitb49d28ca01ffc39efaaf4f93d23dbd9c2fcf17c8 (patch)
tree8cc37a4cd65d7122a2b4a65fdf1813cc072d9f1a
parent9ca44822a3b26ad37c6a45e5385b38c0384e5312 (diff)
downloadaports-b49d28ca01ffc39efaaf4f93d23dbd9c2fcf17c8.tar.bz2
aports-b49d28ca01ffc39efaaf4f93d23dbd9c2fcf17c8.tar.xz
testing/zfs-grsec: split utils and modules
-rw-r--r--testing/zfs-grsec/APKBUILD35
1 files changed, 29 insertions, 6 deletions
diff --git a/testing/zfs-grsec/APKBUILD b/testing/zfs-grsec/APKBUILD
index fafa0e7499..720a571130 100644
--- a/testing/zfs-grsec/APKBUILD
+++ b/testing/zfs-grsec/APKBUILD
@@ -10,7 +10,7 @@ _kver=3.6.7
_kpkgrel=0
_realver=0.6.0-rc12
-_mypkgrel=0
+_mypkgrel=1
# source the kernel version
if [ -f ../../main/linux-$_flavor/APKBUILD ]; then
@@ -34,7 +34,7 @@ depends_dev="glib-dev e2fsprogs-dev util-linux-dev
linux-$_flavor-dev=$_kernelver spl-$_flavor-dev"
makedepends="$depends_dev automake autoconf libtool"
install=""
-subpackages="$pkgname-dev"
+subpackages="$pkgname-dev $pkgname-utils"
source="https://github.com/downloads/zfsonlinux/zfs/zfs-$_realver.tar.gz
timestamp.patch"
@@ -61,6 +61,7 @@ build() {
--infodir=/usr/share/info \
--localstatedir=/var \
--with-config=all \
+ --with-udevdir=/lib/udev \
--with-linux=/usr/src/linux-headers-${_abi_release} \
--with-spl=/usr/src/spl-${_realver}/${_abi_release} \
|| return 1
@@ -68,13 +69,35 @@ build() {
}
package() {
- cd "$_builddir"
- make DESTDIR="$pkgdir" install || return 1
- rm -f "$pkgdir"/usr/lib/*.la
+ cd "$_builddir"
+ make DESTDIR="$pkgdir" install || return 1
+ rm -f "$pkgdir"/usr/lib/*.la
+ rm -rf "$pkgdir"/usr/libexec
+ rm -rf "$pkgdir"/usr/share/dracut
}
dev() {
- default_dev
+ 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
+ rm -f "$subpkgdir"/etc/init.d/zfs
+ install -m755 -D "$_builddir"/etc/init.d/zfs.gentoo.in \
+ "$subpkgdir"/etc/init.d/zfs
+ sed -i -e "s/@sbindir@/\/usr\/sbin/g" \
+ "$subpkgdir"/etc/init.d/zfs || return 1
+ sed -i -e "s/@sysconfdir@/\/etc/g" \
+ "$subpkgdir"/etc/init.d/zfs || return 1
}
md5sums="6524f2c20fe9ad33a97879981e5c9a45 zfs-0.6.0-rc12.tar.gz