summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorDan Theisen <djt@hxx.in>2018-06-22 02:54:07 +0000
committerDan Theisen <djt@hxx.in>2018-06-22 03:47:20 +0000
commit6b7e354f6a0c72eea36e778db0d8e6b3fb67961b (patch)
tree98239334b166f3cb82d11c297e3259eeb0a54c9b /system
parentad7d6d7bbc6899ba18f927cabde2623677152091 (diff)
downloadpackages-6b7e354f6a0c72eea36e778db0d8e6b3fb67961b.tar.gz
packages-6b7e354f6a0c72eea36e778db0d8e6b3fb67961b.tar.bz2
packages-6b7e354f6a0c72eea36e778db0d8e6b3fb67961b.tar.xz
packages-6b7e354f6a0c72eea36e778db0d8e6b3fb67961b.zip
system/lvm2: [PD] fix maintainer and license, modernize, version bump
Diffstat (limited to 'system')
-rw-r--r--system/lvm2/APKBUILD32
1 files changed, 15 insertions, 17 deletions
diff --git a/system/lvm2/APKBUILD b/system/lvm2/APKBUILD
index 862c9fa35..0f222a8dc 100644
--- a/system/lvm2/APKBUILD
+++ b/system/lvm2/APKBUILD
@@ -1,16 +1,17 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
+# Contributor: Natanael Copa <ncopa@alpinelinux.org>
+# Maintainer: Dan Theisen <djt@hxx.in>
pkgname=lvm2
-pkgver=2.02.175
-pkgrel=1
+pkgver=2.02.178
+pkgrel=0
pkgdesc="Logical Volume Manager 2 utilities"
url="http://sourceware.org/lvm2/"
arch="all"
options="!check" # Test tries to use real /dev/mapper/control.
-license="GPL-2.0-only, LGPL-2.1-only"
+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_dev="linux-headers"
-makedepends_build="coreutils"
+makedepends_build="coreutils libaio-dev"
makedepends_host="$depends_dev util-linux-dev"
makedepends="$makedepends_build $makedepends_host"
source="https://mirrors.kernel.org/sourceware/$pkgname/releases/LVM2.$pkgver.tgz
@@ -31,7 +32,7 @@ subpackages="
device-mapper-libs:dm_libs
device-mapper-event-libs:dm_event_libs
$pkgname-libs
- $pkgname-extra
+ $pkgname-extra::noarch
"
builddir="$srcdir/LVM2.$pkgver"
@@ -51,7 +52,6 @@ build () {
--libdir=/lib \
--sbindir=/sbin \
--localstatedir=/var \
- --disable-nls \
--disable-readline \
--enable-pkgconfig \
--enable-applib \
@@ -62,19 +62,17 @@ build () {
--with-thin-dump=/sbin/thin_dump \
--with-thin-repair=/sbin/thin_repair \
--with-dmeventd-path=/sbin/dmeventd \
- CLDFLAGS="$LDFLAGS" \
- || return 1
-
- make || return 1
+ CLDFLAGS="$LDFLAGS"
+ make
}
package() {
cd "$builddir"
- make -j1 DESTDIR="$pkgdir" install || return 1
+ make -j1 DESTDIR="$pkgdir" install
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 || return 1
+ ln -s libdevmapper.so.1.02 "$pkgdir"/lib/libdevmapper.so
}
dmeventd() {
@@ -94,9 +92,9 @@ 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
+ 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() {
@@ -123,7 +121,7 @@ extra() {
done
}
-sha512sums="73837edcad6c4165211be6a3528da62a189f1c97bcdd73a69746df9459d3716c0c44580a654b55e2bcafea48797ce4ecee0f1df22e32e599ddebf942807b2638 LVM2.2.02.175.tgz
+sha512sums="7bc35e9d2f808f50885993d8e36f3eb048d9435b3e475d1bbf1657bc6021121816818b7170a6f86f2dd7b5696e66ad2fec120551557532eef1849bf5a1e23784 LVM2.2.02.178.tgz
6ea4efad03f8632f2883f33f9d9f8ca295f7d8d2aa1bfbfa7738e7d711727a511758848dde5776b222bd74e6fb60bed8b56a3cd2f74ca448b8d86f50470a42b9 fix-stdio-usage.patch
9272ec8c5184ef5dc776ead8f74132e072b7563b5119a3a38b712f00d92a1e3878c9b3a54eb2b01dcba038110c686b39d4c17ecd0eb258537e9217d7ed03c408 mallinfo.patch
33004594a5cce7af1e493a2a66ce8ad2f864dde3b2ec0960d0fda9df9b7bcf65d9455f9eccf7860f48726c48f14111b843b0a0c9bd395ef2952b41aaab8092b2 library_dir-default-config.patch