ssuominen 14/07/30 17:23:37 Modified: lvm2-2.02.108.ebuild ChangeLog Log: Use /bin/true instead of /usr/bin/true in scripts/blk_availability_systemd_red_hat.service.in because Gentoo doesn't have the so called usr -merge wrt #517514 by Markos Chandras. Enable "use_lvmetad = 1" by default in lvm.conf with USE="systemd lvmetad -device-mapper-only" wrt #514196 by Pacho Ramos. (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D)
Revision Changes Path 1.2 sys-fs/lvm2/lvm2-2.02.108.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/lvm2-2.02.108.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/lvm2-2.02.108.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/lvm2-2.02.108.ebuild?r1=1.1&r2=1.2 Index: lvm2-2.02.108.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.108.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- lvm2-2.02.108.ebuild 30 Jul 2014 17:11:27 -0000 1.1 +++ lvm2-2.02.108.ebuild 30 Jul 2014 17:23:37 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.108.ebuild,v 1.1 2014/07/30 17:11:27 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.108.ebuild,v 1.2 2014/07/30 17:23:37 ssuominen Exp $ EAPI=5 inherit autotools eutils linux-info multilib systemd toolchain-funcs udev flag-o-matic @@ -78,6 +78,12 @@ sed -i -e '/FLAG/s:-O2::' configure{.in,} || die #480212 + if use systemd && use lvmetad && ! use device-mapper-only; then + sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196 + fi + + sed -i -e 's:/usr/bin/true:/bin/true:' scripts/blk_availability_systemd_red_hat.service.in || die #517514 + # For upstream -- review and forward: epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch epatch "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch @@ -87,8 +93,8 @@ epatch "${FILESDIR}"/${PN}-2.02.92-dynamic-static-ldflags.patch #332905 epatch "${FILESDIR}"/${PN}-2.02.108-static-pkgconfig-libs.patch #370217, #439414 + blkid epatch "${FILESDIR}"/${PN}-2.02.106-pthread-pkgconfig.patch #492450 - # Upstream never tested with USE="-thin" wrt #510202 - sed -i -e 's|_man7: $(MAN8)|_man7: $(MAN7)|' man/Makefile.in || die + + # Without thin-privision-tools, there is nothing to install for target install_man7: use thin || { sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die; } eautoreconf 1.358 sys-fs/lvm2/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/ChangeLog?rev=1.358&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/ChangeLog?rev=1.358&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/ChangeLog?r1=1.357&r2=1.358 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v retrieving revision 1.357 retrieving revision 1.358 diff -u -r1.357 -r1.358 --- ChangeLog 30 Jul 2014 17:11:27 -0000 1.357 +++ ChangeLog 30 Jul 2014 17:23:37 -0000 1.358 @@ -1,6 +1,13 @@ # ChangeLog for sys-fs/lvm2 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.357 2014/07/30 17:11:27 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.358 2014/07/30 17:23:37 ssuominen Exp $ + + 30 Jul 2014; Samuli Suominen <[email protected]> lvm2-2.02.108.ebuild: + Use /bin/true instead of /usr/bin/true in + scripts/blk_availability_systemd_red_hat.service.in because Gentoo doesn't + have the so called usr -merge wrt #517514 by Markos Chandras. Enable + "use_lvmetad = 1" by default in lvm.conf with USE="systemd lvmetad -device- + mapper-only" wrt #514196 by Pacho Ramos. *lvm2-2.02.108 (30 Jul 2014)
