From 2b147e25fb99eb59689529566771f67b78921889 Mon Sep 17 00:00:00 2001
From: Luis Ressel <aranea@aixah.de>
Date: Sun, 21 Jul 2019 16:51:14 +0200
Subject: system/lvm2: Merge dmeventd/device-mapper subpkgs into lvm2

This makes the packages significantly saner, at the expense of pulling
in a few more MB worth of files for users who only need dmsetup or
libdevicemapper. Currently, it's not clear to users where the
development headers or man pages for these can be found, and there are a
few more minor annoyances such as the dmeventd openrc script not being
contained in an -openrc subpackage.

The /lib/libdevmapper.so symlink should be unneccessary, since there's
already a symlink in /usr/lib/.

Half the .so symlinks are in /lib/, while the other half is in
/usr/lib/, but imho fixing that isn't worth the hassle.
---
 system/lvm2/APKBUILD | 44 ++++++--------------------------------------
 1 file changed, 6 insertions(+), 38 deletions(-)

diff --git a/system/lvm2/APKBUILD b/system/lvm2/APKBUILD
index f00157787..842dee2fa 100644
--- a/system/lvm2/APKBUILD
+++ b/system/lvm2/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Dan Theisen <djt@hxx.in>
 pkgname=lvm2
 pkgver=2.03.05
-pkgrel=1
+pkgrel=2
 pkgdesc="Logical Volume Manager 2 utilities"
 url="https://sourceware.org/lvm2/"
 arch="all"
@@ -14,6 +14,7 @@ depends_dev="linux-headers"
 makedepends_build="coreutils libaio-dev"
 makedepends_host="$depends_dev util-linux-dev"
 makedepends="$makedepends_build $makedepends_host"
+replaces="device-mapper $pkgname-dmeventd"
 source="https://mirrors.kernel.org/sourceware/$pkgname/LVM2.$pkgver.tgz
 	fix-stdio-usage.patch
 	mallinfo.patch
@@ -25,11 +26,7 @@ source="https://mirrors.kernel.org/sourceware/$pkgname/LVM2.$pkgver.tgz
 subpackages="
 	$pkgname-dev
 	$pkgname-doc
-	$pkgname-dmeventd
 	$pkgname-openrc
-	device-mapper:dm
-	device-mapper-libs:dm_libs
-	device-mapper-event-libs:dm_event_libs
 	$pkgname-libs
 	$pkgname-udev
 	"
@@ -66,43 +63,14 @@ package() {
 	install -d "$pkgdir"/etc/lvm/archive "$pkgdir"/etc/lvm/backup
 	install -Dm755 "$srcdir"/lvm.initd "$pkgdir"/etc/init.d/lvm
 	install -Dm644 "$srcdir"/lvm.confd "$pkgdir"/etc/conf.d/lvm
-	ln -s libdevmapper.so.1.02 "$pkgdir"/lib/libdevmapper.so
-}
-
-dmeventd() {
-	pkgdesc="Device-mapper event daemon"
-	mkdir -p "$subpkgdir"/sbin
-	mv "$pkgdir"/sbin/dmeventd "$subpkgdir"/sbin/
-	install -Dm755 "$srcdir"/dmeventd.initd "$subpkgdir"/etc/init.d/dmeventd
-}
-
-dm() {
-	pkgdesc="Device mapper userspace library and tools from LVM2"
-	mkdir -p "$subpkgdir"/sbin "$subpkgdir"/lib
-	mv "$pkgdir"/sbin/dm* "$subpkgdir"/sbin/
+	install -Dm755 "$srcdir"/dmeventd.initd "$pkgdir"/etc/init.d/dmeventd
 }
 
 libs() {
-	pkgdesc="LVM2 shared libraries"
-	depends=""
-	mkdir -p "$subpkgdir"/lib
-	mv "$pkgdir"/lib/liblvm2*.so.* "$subpkgdir"/lib/
-	mv "$pkgdir"/lib/libdevmapper-event-lvm2*.so.* "$subpkgdir"/lib/
-	mv "$pkgdir"/lib/device-mapper "$subpkgdir"/lib/
-}
-
-dm_libs() {
-	pkgdesc="Device-mapper shared library"
-	depends=""
-	mkdir -p "$subpkgdir"/lib
-	mv "$pkgdir"/lib/libdevmapper.so.* "$subpkgdir"/lib/
-}
+	replaces="device-mapper-libs device-mapper-event-libs"
+	default_libs
 
-dm_event_libs() {
-	pkgdesc="Device-mapper event daemon shared library"
-	depends=""
-	mkdir -p "$subpkgdir"/lib
-	mv "$pkgdir"/lib/libdevmapper-event.so.* "$subpkgdir"/lib/
+	mv "$pkgdir/lib/device-mapper" "$subpkgdir/lib/"
 }
 
 udev() {
-- 
cgit v1.2.3-70-g09d2


From d226a7faad5a0fb21de53f37cfa3b05fdced8af7 Mon Sep 17 00:00:00 2001
From: Luis Ressel <aranea@aixah.de>
Date: Sun, 21 Jul 2019 17:32:05 +0200
Subject: system/cryptsetup, user/dracut: Update deps after the lvm2 subpkg
 merge

---
 system/cryptsetup/APKBUILD | 2 +-
 user/dracut/APKBUILD       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/system/cryptsetup/APKBUILD b/system/cryptsetup/APKBUILD
index 533f036f8..5116640ac 100644
--- a/system/cryptsetup/APKBUILD
+++ b/system/cryptsetup/APKBUILD
@@ -12,7 +12,7 @@ makedepends_build=""
 makedepends_host="lvm2-dev openssl-dev popt-dev util-linux-dev json-c-dev
 	argon2-dev"
 makedepends="$makedepends_build $makedepends_host"
-checkdepends="device-mapper sharutils debianutils-which bash"
+checkdepends="bash debianutils-which lvm2 sharutils"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-lang $pkgname-libs $pkgname-openrc"
 source="https://www.kernel.org/pub/linux/utils/$pkgname/v${pkgver%.*}/$pkgname-$pkgver.tar.gz
 	dmcrypt.confd
diff --git a/user/dracut/APKBUILD b/user/dracut/APKBUILD
index 8782ed974..6be168f60 100644
--- a/user/dracut/APKBUILD
+++ b/user/dracut/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=dracut
 pkgver=048
-pkgrel=1
+pkgrel=2
 pkgdesc="Event-driven initramfs infrastructure"
 url="https://dracut.wiki.kernel.org/"
 arch="all"
@@ -53,13 +53,13 @@ bashcomp() {
 }
 
 crypt() {
-	depends="cryptsetup device-mapper dracut"
+	depends="cryptsetup dracut lvm2"
 	pkgdesc="$pkgname - LUKS / disk encryption support (crypt) module"
 	mkdir -p "$subpkgdir"
 }
 
 lvm() {
-	depends="device-mapper dracut lvm2"
+	depends="dracut lvm2"
 	pkgdesc="$pkgname - LVM2 module"
 	mkdir -p "$subpkgdir"
 }
-- 
cgit v1.2.3-70-g09d2