diff options
| author | Carlo Landmeter <clandmeter@alpinelinux.org> | 2019-10-14 12:02:21 +0000 |
|---|---|---|
| committer | Carlo Landmeter <clandmeter@alpinelinux.org> | 2019-10-14 12:02:51 +0000 |
| commit | b8d37a8382409df2d80638226e3fc75ee06f76d4 (patch) | |
| tree | 9d8c5eced1b86ab04f9ba7e7626c2daaa33016a8 /main | |
| parent | f6cc7a7648e2c00546302498c81dd5d1d9e673ee (diff) | |
| download | aports-b8d37a8382409df2d80638226e3fc75ee06f76d4.tar.bz2 aports-b8d37a8382409df2d80638226e3fc75ee06f76d4.tar.xz | |
main/lvm2: upgrade to 2.02.186
add udev rules for device mapper
fix license notation
Diffstat (limited to 'main')
| -rw-r--r-- | main/lvm2/APKBUILD | 19 | ||||
| -rw-r--r-- | main/lvm2/fix-stdio-usage.patch | 24 |
2 files changed, 26 insertions, 17 deletions
diff --git a/main/lvm2/APKBUILD b/main/lvm2/APKBUILD index a0ac3166f2..1ba88ea51a 100644 --- a/main/lvm2/APKBUILD +++ b/main/lvm2/APKBUILD @@ -1,12 +1,12 @@ # Maintainer: Natanael Copa <ncopa@alpinelinux.org> pkgname=lvm2 -pkgver=2.02.184 +pkgver=2.02.186 pkgrel=0 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-only, LGPL-2.1-only" +license="GPL-2.0-only 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" @@ -30,8 +30,9 @@ subpackages=" device-mapper:dm device-mapper-libs:dm_libs device-mapper-event-libs:dm_event_libs + device-mapper-udev:udev:noarch $pkgname-libs - $pkgname-extra + $pkgname-extra::noarch " builddir="$srcdir/LVM2.$pkgver" @@ -62,6 +63,7 @@ build () { --with-thin-dump=/sbin/thin_dump \ --with-thin-repair=/sbin/thin_repair \ --with-dmeventd-path=/sbin/dmeventd \ + --enable-udev_rules \ CLDFLAGS="$LDFLAGS" \ || return 1 @@ -90,6 +92,13 @@ dm() { mv "$pkgdir"/sbin/dm* "$subpkgdir"/sbin/ } +udev() { + pkgdesc="Device mapper udev rules" + install_if="device-mapper eudev" + mkdir -p "$subpkgdir"/usr/lib/udev + mv "$pkgdir"/usr/lib/udev/rules.d "$subpkgdir"/usr/lib/udev/ +} + libs() { pkgdesc="LVM2 shared libraries" depends= @@ -123,8 +132,8 @@ extra() { done } -sha512sums="9db74f675e7c58f663a39afb79b6f33a33ad2cfbda63e9783ef5027f33977b4a1262a2e6754aa67c586eed083ee119a2e837c32a7746dcc53f13877c9d65c390 LVM2.2.02.184.tgz -bb487ee287872d7e9650a5a187c64a8e18525dde876fd4c5fe71d80f2263345fd793eb52b65ebdc91178d0ca96ffff145fbaa049bcf513f63a8b0e0306141e22 fix-stdio-usage.patch +sha512sums="06a1c00142ee41d8a576a5e06a5beae70baced3020e753ce3b612355cc4d9e33be4acf58569d49436c4ee1118d288d884c7301b7d886074eaf9f2fa6b0248c03 LVM2.2.02.186.tgz +9ad38a68620986db826ccbc4972c44b3ef12e5b37f1f573db20748e7b2327726c7c51b04aaad2a2e9bb76101ec352b7e7a102fdc4a75e79e9587cfc3b87da0e5 fix-stdio-usage.patch 9272ec8c5184ef5dc776ead8f74132e072b7563b5119a3a38b712f00d92a1e3878c9b3a54eb2b01dcba038110c686b39d4c17ecd0eb258537e9217d7ed03c408 mallinfo.patch 33004594a5cce7af1e493a2a66ce8ad2f864dde3b2ec0960d0fda9df9b7bcf65d9455f9eccf7860f48726c48f14111b843b0a0c9bd395ef2952b41aaab8092b2 library_dir-default-config.patch e113c518bb7f03feea892252518f1df3733fad32f04ed0701a8313cf35ba932c3e2d29ecd97d739f8908b481ed1f6a2eb0129cb307214d0a084d9a8d0b4bc290 mlockall-default-config.patch diff --git a/main/lvm2/fix-stdio-usage.patch b/main/lvm2/fix-stdio-usage.patch index ea11b7137f..5ac99fd26e 100644 --- a/main/lvm2/fix-stdio-usage.patch +++ b/main/lvm2/fix-stdio-usage.patch @@ -27,23 +27,23 @@ printf("stderr stream open: %s\n", strerror(errno)); return 0; ---- ./lib/commands/toolcontext.c.orig +--- ./lib/commands/toolcontext.c +++ ./lib/commands/toolcontext.c -@@ -1860,7 +1860,7 @@ - /* FIXME Make this configurable? */ - reset_lvm_errno(1); +@@ -1869,7 +1869,7 @@ + /* FIXME Make this configurable? */ + reset_lvm_errno(1); -#ifndef VALGRIND_POOL +#if !defined(VALGRIND_POOL) && defined(__GLIBC__) - /* Set in/out stream buffering before glibc */ - if (set_buffering + /* Set in/out stream buffering before glibc */ + if (set_buffering #ifdef SYS_gettid -@@ -2254,7 +2254,7 @@ - if (cmd->libmem) - dm_pool_destroy(cmd->libmem); +@@ -2274,7 +2274,7 @@ + if (cmd->pending_delete_mem) + dm_pool_destroy(cmd->pending_delete_mem); -#ifndef VALGRIND_POOL +#if !defined(VALGRIND_POOL) && defined(__GLIBC__) - if (cmd->linebuffer) { - /* Reset stream buffering to defaults */ - if (is_valid_fd(STDIN_FILENO) && + if (cmd->linebuffer) { + /* Reset stream buffering to defaults */ + if (is_valid_fd(STDIN_FILENO) && |