summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuis Ressel <aranea@aixah.de>2019-07-21 16:51:14 +0200
committerLuis Ressel <aranea@aixah.de>2019-07-21 17:23:04 +0200
commit2b147e25fb99eb59689529566771f67b78921889 (patch)
tree7d1c187f0fefff1bd3810677c0feb31109e486df
parentd3eb7058d8f66a7fa94c262314df4c95a76a36fc (diff)
downloadpackages-2b147e25fb99eb59689529566771f67b78921889.tar.gz
packages-2b147e25fb99eb59689529566771f67b78921889.tar.bz2
packages-2b147e25fb99eb59689529566771f67b78921889.tar.xz
packages-2b147e25fb99eb59689529566771f67b78921889.zip
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.
-rw-r--r--system/lvm2/APKBUILD44
1 files 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() {