diff --git a/common/shlibs b/common/shlibs index 802db967cd2..373d4650970 100644 --- a/common/shlibs +++ b/common/shlibs @@ -213,6 +213,9 @@ libgnutls-extra.so.26 gnutls gnutls-devel libgnutls-openssl.so.26 gnutls gnutls-devel libwrap.so.0 tcp_wrappers-libs tcp_wrappers-devel libdevmapper.so.1.02 device-mapper device-mapper-devel +libdevmapper-event.so.1.02 device-mapper device-mapper-devel +libdevmapper-event-lvm2.so.2.02 device-mapper device-mapper-devel +liblvm2cmd.so.2.02 device-mapper device-mapper-devel libprop.so.0 proplib proplib-devel libxbps.so.0 xbps xbps-static libxbps.so.0 xbps-devel xbps-devel-static diff --git a/srcpkgs/lvm2/device-mapper-devel.template b/srcpkgs/lvm2/device-mapper-devel.template index c0528d02c9b..c1ad2717431 100644 --- a/srcpkgs/lvm2/device-mapper-devel.template +++ b/srcpkgs/lvm2/device-mapper-devel.template @@ -5,14 +5,13 @@ long_desc=" This package contains the development files for the kernel device-mapper library, libdevmapper." -Add_dependency run glibc-devel Add_dependency run readline-devel Add_dependency run ncurses-devel -Add_dependency run device-mapper +Add_dependency run device-mapper ">=${version}" -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib - mv ${SRCPKGDESTDIR}/usr/include ${DESTDIR}/usr - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/lib +revision=1 + +do_install() { + vmove usr/include usr + vmove usr/lib/pkgconfig usr/lib } diff --git a/srcpkgs/lvm2/device-mapper.rshlibs b/srcpkgs/lvm2/device-mapper.rshlibs index 334779a411b..a897f53e03d 100644 --- a/srcpkgs/lvm2/device-mapper.rshlibs +++ b/srcpkgs/lvm2/device-mapper.rshlibs @@ -1,3 +1,5 @@ libc.so.6 libudev.so.0 librt.so.1 +libdl.so.2 +libpthread.so.0 diff --git a/srcpkgs/lvm2/device-mapper.template b/srcpkgs/lvm2/device-mapper.template index 5d4cd5b6906..3ef7426af5a 100644 --- a/srcpkgs/lvm2/device-mapper.template +++ b/srcpkgs/lvm2/device-mapper.template @@ -6,10 +6,12 @@ long_desc=" for the kernel device-mapper and its required library, libdevmapper." replaces="lvm2-device-mapper>=0" -revision=1 +revision=2 do_install() { vmove "usr/sbin/dm*" usr/sbin - vmove "usr/lib/libdevmapper.so*" usr/lib + vmove "usr/lib/libdevmapper*.so*" usr/lib + vmove "usr/lib/liblvm2cmd.so*" usr/lib vmove "usr/share/man/man8/dm*" usr/share/man/man8 + vmove usr/lib/device-mapper usr/lib } diff --git a/srcpkgs/lvm2/files/11-dm-initramfs.rules b/srcpkgs/lvm2/files/11-dm-initramfs.rules new file mode 100644 index 00000000000..45438e42201 --- /dev/null +++ b/srcpkgs/lvm2/files/11-dm-initramfs.rules @@ -0,0 +1,3 @@ +# needed with new udev and as implemented in dracut: +# +SUBSYSTEM=="block", KERNEL=="dm-[0-9]*", ACTION=="add|change", OPTIONS="db_persist" diff --git a/srcpkgs/lvm2/files/lvm2.initramfs-hook b/srcpkgs/lvm2/files/lvm2.initramfs-hook index 10a3e9ee6cd..c7059c59ab5 100644 --- a/srcpkgs/lvm2/files/lvm2.initramfs-hook +++ b/srcpkgs/lvm2/files/lvm2.initramfs-hook @@ -26,7 +26,8 @@ if [ -e /etc/lvm/lvm.conf ]; then fi mkdir -p ${DESTDIR}/lib/udev/rules.d -for f in 10-dm.rules 11-dm-lvm.rules 13-dm-disk.rules 95-dm-notify.rules; do +for f in 10-dm.rules 11-dm-initramfs.rules 11-dm-lvm.rules \ + 13-dm-disk.rules 95-dm-notify.rules; do cp /lib/udev/rules.d/${f} ${DESTDIR}/lib/udev/rules.d done diff --git a/srcpkgs/lvm2/liblvm2app-devel.template b/srcpkgs/lvm2/liblvm2app-devel.template index 89979a19aae..2caf18300b0 100644 --- a/srcpkgs/lvm2/liblvm2app-devel.template +++ b/srcpkgs/lvm2/liblvm2app-devel.template @@ -6,12 +6,11 @@ long_desc=" lvm2app library." Add_dependency run device-mapper-devel -Add_dependency run liblvm2app +Add_dependency run liblvm2app ">=${version}" -do_install() -{ - mkdir -p ${DESTDIR}/usr/lib/pkgconfig ${DESTDIR}/usr/include - mv ${SRCPKGDESTDIR}/usr/include/lvm2app.h ${DESTDIR}/usr/include - mv ${SRCPKGDESTDIR}/usr/lib/pkgconfig/lvm2app* \ - ${DESTDIR}/usr/lib/pkgconfig +revision=1 + +do_install() { + vmove usr/include/lvm2app.h usr/include + vmove "usr/lib/pkgconfig/lvm2app*" usr/lib/pkgconfig } diff --git a/srcpkgs/lvm2/liblvm2app.rshlibs b/srcpkgs/lvm2/liblvm2app.rshlibs index 2a1a438128d..069feb764ba 100644 --- a/srcpkgs/lvm2/liblvm2app.rshlibs +++ b/srcpkgs/lvm2/liblvm2app.rshlibs @@ -3,3 +3,4 @@ libdevmapper.so.1.02 libc.so.6 libudev.so.0 librt.so.1 +libdevmapper-event.so.1.02 diff --git a/srcpkgs/lvm2/liblvm2app.template b/srcpkgs/lvm2/liblvm2app.template index 939d5b99b8d..1f9fbffa5da 100644 --- a/srcpkgs/lvm2/liblvm2app.template +++ b/srcpkgs/lvm2/liblvm2app.template @@ -6,6 +6,8 @@ long_desc=" to the basic LVM objects and provides functions to enumerate, create or modify them." +revision=1 + do_install() { vmove "usr/lib/liblvm2app.so*" usr/lib } diff --git a/srcpkgs/lvm2/lvm2.rshlibs b/srcpkgs/lvm2/lvm2.rshlibs index 4c4031310e5..8ac64d96c7f 100644 --- a/srcpkgs/lvm2/lvm2.rshlibs +++ b/srcpkgs/lvm2/lvm2.rshlibs @@ -3,3 +3,4 @@ libdevmapper.so.1.02 libreadline.so.6 libc.so.6 libudev.so.0 +libdevmapper-event.so.1.02 diff --git a/srcpkgs/lvm2/template b/srcpkgs/lvm2/template index e48d31daa73..8e99c48690a 100644 --- a/srcpkgs/lvm2/template +++ b/srcpkgs/lvm2/template @@ -1,13 +1,14 @@ # Template file for 'lvm2' pkgname=lvm2 version=2.02.95 -revision=1 +revision=2 wrksrc=LVM2.${version} distfiles="ftp://sources.redhat.com/pub/lvm2/LVM2.${version}.tgz" build_style=gnu-configure configure_args="--disable-selinux --enable-readline --enable-pkgconfig --enable-fsadm --enable-applib --sbindir=/usr/sbin --libdir=/usr/lib ---enable-udev_sync --enable-udev_rules --with-udevdir=/lib/udev/rules.d" +--enable-dmeventd --enable-cmdlib --enable-udev_sync --enable-udev_rules +--with-udevdir=/lib/udev/rules.d" short_desc="Logical Volume Manager 2 utilities" maintainer="Juan RP " homepage="http://sourceware.org/lvm2/" @@ -42,4 +43,5 @@ post_install() { ${initramfsdir}/hooks lvm2 vinstall ${FILESDIR}/lvm2.initramfs-local-top 755 \ ${initramfsdir}/scripts/local-top lvm2 + vinstall ${FILESDIR}/11-dm-initramfs.rules 644 lib/udev/rules.d }