main/lvm2: subpackages for libdevmapper and libdevmapper-event

1 files changed, 21 insertions, 6 deletions

diff --git a/main/lvm2/APKBUILD b/main/lvm2/APKBUILD
index 7b90518415..864ec4159b 100644
--- a/main/lvm2/APKBUILD
+++ b/main/lvm2/APKBUILD
@@ -1,12 +1,13 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=lvm2
 pkgver=2.02.168
-pkgrel=1
+pkgrel=2
 pkgdesc="Logical Volume Manager 2 utilities"
 url="http://sourceware.org/lvm2/"
 arch="all"
 license="GPL"
-depends=
+# lvm2 will dlopen libs so we need to add explicit depend
+depends="lvm2-libs=$pkgver-r$pkgrel"
 depends_dev="linux-headers"
 makedepends_build="coreutils"
 makedepends_host="$depends_dev"
@@ -25,6 +26,8 @@ subpackages="
 	$pkgname-doc
 	$pkgname-dmeventd
 	device-mapper:dm
+	device-mapper-libs:dm_libs
+	device-mapper-event-libs:dm_event_libs
 	$pkgname-libs
 	$pkgname-extra
 	"
@@ -82,16 +85,28 @@ dmeventd() {
 dm() {
 	pkgdesc="Device mapper userspace library and tools from LVM2"
 	mkdir -p "$subpkgdir"/sbin "$subpkgdir"/lib
-	mv "$pkgdir"/lib/libdevmapper.so.* "$subpkgdir"/lib/
 	mv "$pkgdir"/sbin/dm* "$subpkgdir"/sbin/
 }
 
 libs() {
 	pkgdesc="LVM2 shared libraries"
+	depends=
+	mkdir -p "$subpkgdir"/lib
+	mv "$pkgdir"/lib/liblvm2*.so.* "$subpkgdir"/lib/ || return 1
+	mv "$pkgdir"/lib/libdevmapper-event-lvm2*.so.* "$subpkgdir"/lib/ || return 1
+	mv "$pkgdir"/lib/device-mapper "$subpkgdir"/lib/ || return 1
+}
+
+dm_libs() {
+	pkgdesc="Device-mapper shared library"
+	mkdir -p "$subpkgdir"/lib
+	mv "$pkgdir"/lib/libdevmapper.so.* "$subpkgdir"/lib/
+}
+
+dm_event_libs() {
+	pkgdesc="Device-mapper event daemon shared library"
 	mkdir -p "$subpkgdir"/lib
-	mv "$pkgdir"/lib/liblvm2*.so.* "$subpkgdir"/lib/
-	mv "$pkgdir"/lib/libdevmapper-event*.so.* "$subpkgdir"/lib/
-	mv "$pkgdir"/lib/device-mapper "$subpkgdir"/lib/
+	mv "$pkgdir"/lib/libdevmapper-event.so.* "$subpkgdir"/lib/
 }
 
 extra() {