summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--system/lvm2/APKBUILD23
-rw-r--r--system/lvm2/library_dir-default-config.patch10
2 files changed, 16 insertions, 17 deletions
diff --git a/system/lvm2/APKBUILD b/system/lvm2/APKBUILD
index 8287d3813..f00157787 100644
--- a/system/lvm2/APKBUILD
+++ b/system/lvm2/APKBUILD
@@ -2,14 +2,14 @@
# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=lvm2
pkgver=2.03.05
-pkgrel=0
+pkgrel=1
pkgdesc="Logical Volume Manager 2 utilities"
url="https://sourceware.org/lvm2/"
arch="all"
options="!check" # Test tries to use real /dev/mapper/control.
license="GPL-2.0+ AND LGPL-2.1-only"
# lvm2 will dlopen libs so we need to add explicit depend
-depends="lvm2-libs=$pkgver-r$pkgrel"
+depends="lvm2-libs=$pkgver-r$pkgrel util-linux"
depends_dev="linux-headers"
makedepends_build="coreutils libaio-dev"
makedepends_host="$depends_dev util-linux-dev"
@@ -17,7 +17,6 @@ makedepends="$makedepends_build $makedepends_host"
source="https://mirrors.kernel.org/sourceware/$pkgname/LVM2.$pkgver.tgz
fix-stdio-usage.patch
mallinfo.patch
- library_dir-default-config.patch
mlockall-default-config.patch
lvm.initd
lvm.confd
@@ -32,6 +31,7 @@ subpackages="
device-mapper-libs:dm_libs
device-mapper-event-libs:dm_event_libs
$pkgname-libs
+ $pkgname-udev
"
builddir="$srcdir/LVM2.$pkgver"
@@ -84,7 +84,7 @@ dm() {
libs() {
pkgdesc="LVM2 shared libraries"
- depends=
+ depends=""
mkdir -p "$subpkgdir"/lib
mv "$pkgdir"/lib/liblvm2*.so.* "$subpkgdir"/lib/
mv "$pkgdir"/lib/libdevmapper-event-lvm2*.so.* "$subpkgdir"/lib/
@@ -93,22 +93,31 @@ libs() {
dm_libs() {
pkgdesc="Device-mapper shared library"
- depends=
+ depends=""
mkdir -p "$subpkgdir"/lib
mv "$pkgdir"/lib/libdevmapper.so.* "$subpkgdir"/lib/
}
dm_event_libs() {
pkgdesc="Device-mapper event daemon shared library"
- depends=
+ depends=""
mkdir -p "$subpkgdir"/lib
mv "$pkgdir"/lib/libdevmapper-event.so.* "$subpkgdir"/lib/
}
+udev() {
+ pkgdesc="udev rules for LVM and device mapper"
+ install_if="$pkgname=$pkgver-r$pkgrel eudev"
+
+ make -C "$builddir"/udev
+ install -m644 -Dt "$subpkgdir"/lib/udev/rules.d/ \
+ "$builddir"/udev/*.rules
+}
+
+
sha512sums="3b00f53771e99faa6459ae73353bff06ae37c64bd2659586ec25d0bb43bc3ff8ba5f713c68617fd7662a5f6cb65bca1ad0aea554819048d79c1cce20bf67c50a LVM2.2.03.05.tgz
6ea4efad03f8632f2883f33f9d9f8ca295f7d8d2aa1bfbfa7738e7d711727a511758848dde5776b222bd74e6fb60bed8b56a3cd2f74ca448b8d86f50470a42b9 fix-stdio-usage.patch
9272ec8c5184ef5dc776ead8f74132e072b7563b5119a3a38b712f00d92a1e3878c9b3a54eb2b01dcba038110c686b39d4c17ecd0eb258537e9217d7ed03c408 mallinfo.patch
-33004594a5cce7af1e493a2a66ce8ad2f864dde3b2ec0960d0fda9df9b7bcf65d9455f9eccf7860f48726c48f14111b843b0a0c9bd395ef2952b41aaab8092b2 library_dir-default-config.patch
d190c40a137b006d7b63298069c93ff08d2804b990e85d44739cd7c48beec9a569903b98f0d940895fc7365723ba886acd7ef0e08f1f65a1a391d1c448ce080e mlockall-default-config.patch
a853078660fd2fd943538924f56e81dc5793294e26b8f61d93e6188893f15f4a438d33792b341c1865d61e03f4a371b7c7ee0db5f4130ef7cb7aeaeb9290086a lvm.initd
07caf8fa942290f3c953cc2463aaf55bac01d0bcb9351daf3880fa4d0eefb67fe00761c46a7a4da91cd2f8e492a12fed35853a15dc939cd80d19d3303bc3951d lvm.confd
diff --git a/system/lvm2/library_dir-default-config.patch b/system/lvm2/library_dir-default-config.patch
deleted file mode 100644
index 6e3b95832..000000000
--- a/system/lvm2/library_dir-default-config.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./conf/example.conf.in.orig
-+++ ./conf/example.conf.in
-@@ -694,6 +694,7 @@
- # Configuration option global/library_dir.
- # Search this directory first for shared libraries.
- # This configuration option does not have a default value defined.
-+ library_dir="/lib/device-mapper"
-
- # Configuration option global/locking_library.
- # The external locking library to use for locking_type 2.