lvm2: update for libudev-183.
This commit is contained in:
parent
182ad0da0a
commit
4d22c1fae9
|
@ -1,13 +1,12 @@
|
|||
# Template file for 'device-mapper-devel'
|
||||
#
|
||||
depends="readline-devel ncurses-devel device-mapper>=2.02.95"
|
||||
noarch=yes
|
||||
depends="readline-devel ncurses-devel device-mapper>=$version"
|
||||
short_desc="${sourcepkg} development files"
|
||||
long_desc="
|
||||
This package contains the development files for the kernel device-mapper
|
||||
library, libdevmapper."
|
||||
|
||||
|
||||
|
||||
do_install() {
|
||||
vmove usr/include usr
|
||||
vmove usr/lib/pkgconfig usr/lib
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
libc.so.6
|
||||
libudev.so.0
|
||||
librt.so.1
|
||||
libdl.so.2
|
||||
libpthread.so.0
|
||||
libudev.so.1
|
||||
|
|
|
@ -1,13 +1,12 @@
|
|||
# Template file for 'liblvm2app-devel'
|
||||
#
|
||||
depends="device-mapper-devel liblvm2app>=2.02.95"
|
||||
noarch=yes
|
||||
depends="device-mapper-devel>=$version liblvm2app>=$version"
|
||||
short_desc="LVM2 application library - development files"
|
||||
long_desc="
|
||||
This package contains files needed to develop applications that use the
|
||||
lvm2app library."
|
||||
|
||||
|
||||
|
||||
do_install() {
|
||||
vmove usr/include/lvm2app.h usr/include
|
||||
vmove "usr/lib/pkgconfig/lvm2app*" usr/lib/pkgconfig
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
libdl.so.2
|
||||
libdevmapper.so.1.02
|
||||
libc.so.6
|
||||
libudev.so.0
|
||||
librt.so.1
|
||||
libdevmapper-event.so.1.02
|
||||
libudev.so.1
|
||||
|
|
|
@ -2,5 +2,5 @@ libdl.so.2
|
|||
libdevmapper.so.1.02
|
||||
libreadline.so.6
|
||||
libc.so.6
|
||||
libudev.so.0
|
||||
libdevmapper-event.so.1.02
|
||||
libudev.so.1
|
||||
|
|
|
@ -0,0 +1,33 @@
|
|||
--- tools/dmsetup.c.orig 2012-05-26 16:02:35.578910688 +0200
|
||||
+++ tools/dmsetup.c 2012-05-26 16:02:54.250473829 +0200
|
||||
@@ -1009,7 +1009,7 @@ static int _udevcookies(CMD_ARGS)
|
||||
static int _set_up_udev_support(const char *dev_dir)
|
||||
{
|
||||
struct udev *udev;
|
||||
- const char *udev_dev_dir;
|
||||
+ const char *udev_dev_dir = "/dev";
|
||||
size_t udev_dev_dir_len;
|
||||
int dirs_diff;
|
||||
const char *env;
|
||||
@@ -1030,9 +1030,7 @@ static int _set_up_udev_support(const ch
|
||||
" defined by --udevcookie option.",
|
||||
_udev_cookie);
|
||||
|
||||
- if (!(udev = udev_new()) ||
|
||||
- !(udev_dev_dir = udev_get_dev_path(udev)) ||
|
||||
- !*udev_dev_dir) {
|
||||
+ if (!(udev = udev_new())) {
|
||||
log_error("Could not get udev dev path.");
|
||||
return 0;
|
||||
}
|
||||
--- lib/misc/lvm-wrappers.c.orig 2012-05-26 16:03:22.657809165 +0200
|
||||
+++ lib/misc/lvm-wrappers.c 2012-05-26 16:03:46.664247487 +0200
|
||||
@@ -72,7 +72,7 @@ const char *udev_get_dev_dir(void)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
- return udev_get_dev_path(_udev);
|
||||
+ return "/dev";
|
||||
}
|
||||
|
||||
struct udev* udev_get_library_context(void)
|
|
@ -1,7 +1,7 @@
|
|||
# Template file for 'lvm2'
|
||||
pkgname=lvm2
|
||||
version=2.02.95
|
||||
revision=5
|
||||
revision=6
|
||||
wrksrc=LVM2.${version}
|
||||
distfiles="ftp://sources.redhat.com/pub/lvm2/LVM2.${version}.tgz"
|
||||
build_style=gnu-configure
|
||||
|
@ -10,7 +10,10 @@ configure_args="--disable-selinux --enable-readline --enable-pkgconfig
|
|||
--enable-dmeventd --enable-cmdlib --enable-udev_sync --enable-udev_rules
|
||||
--with-udevdir=/lib/udev/rules.d"
|
||||
depends="bash"
|
||||
makedepends="pkg-config readline-devel libudev-devel"
|
||||
makedepends="pkg-config readline-devel libudev-devel>=183"
|
||||
subpackages="liblvm2app liblvm2app-devel device-mapper device-mapper-devel"
|
||||
conf_files="/etc/lvm/lvm.conf"
|
||||
triggers="initramfs-tools"
|
||||
short_desc="Logical Volume Manager 2 utilities"
|
||||
maintainer="Juan RP <xtraeme@gmail.com>"
|
||||
homepage="http://sourceware.org/lvm2/"
|
||||
|
@ -24,11 +27,6 @@ long_desc="
|
|||
or more physical volumes and creating one or more logical volumes
|
||||
(kind of logical partitions) in volume groups."
|
||||
|
||||
subpackages="liblvm2app liblvm2app-devel device-mapper device-mapper-devel"
|
||||
conf_files="/etc/lvm/lvm.conf"
|
||||
triggers="initramfs-tools"
|
||||
|
||||
|
||||
post_install() {
|
||||
local initramfsdir=usr/share/initramfs-tools
|
||||
|
||||
|
|
Loading…
Reference in New Issue