| 1 |
ssuominen 14/07/30 17:23:37 |
| 2 |
|
| 3 |
Modified: lvm2-2.02.108.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
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. |
| 6 |
|
| 7 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 sys-fs/lvm2/lvm2-2.02.108.ebuild |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/lvm2-2.02.108.ebuild?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/lvm2-2.02.108.ebuild?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/lvm2-2.02.108.ebuild?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: lvm2-2.02.108.ebuild |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.108.ebuild,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- lvm2-2.02.108.ebuild 30 Jul 2014 17:11:27 -0000 1.1 |
| 23 |
+++ lvm2-2.02.108.ebuild 30 Jul 2014 17:23:37 -0000 1.2 |
| 24 |
@@ -1,6 +1,6 @@ |
| 25 |
# Copyright 1999-2014 Gentoo Foundation |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.108.ebuild,v 1.1 2014/07/30 17:11:27 ssuominen Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.108.ebuild,v 1.2 2014/07/30 17:23:37 ssuominen Exp $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
inherit autotools eutils linux-info multilib systemd toolchain-funcs udev flag-o-matic |
| 32 |
@@ -78,6 +78,12 @@ |
| 33 |
|
| 34 |
sed -i -e '/FLAG/s:-O2::' configure{.in,} || die #480212 |
| 35 |
|
| 36 |
+ if use systemd && use lvmetad && ! use device-mapper-only; then |
| 37 |
+ sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196 |
| 38 |
+ fi |
| 39 |
+ |
| 40 |
+ sed -i -e 's:/usr/bin/true:/bin/true:' scripts/blk_availability_systemd_red_hat.service.in || die #517514 |
| 41 |
+ |
| 42 |
# For upstream -- review and forward: |
| 43 |
epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch |
| 44 |
epatch "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch |
| 45 |
@@ -87,8 +93,8 @@ |
| 46 |
epatch "${FILESDIR}"/${PN}-2.02.92-dynamic-static-ldflags.patch #332905 |
| 47 |
epatch "${FILESDIR}"/${PN}-2.02.108-static-pkgconfig-libs.patch #370217, #439414 + blkid |
| 48 |
epatch "${FILESDIR}"/${PN}-2.02.106-pthread-pkgconfig.patch #492450 |
| 49 |
- # Upstream never tested with USE="-thin" wrt #510202 |
| 50 |
- sed -i -e 's|_man7: $(MAN8)|_man7: $(MAN7)|' man/Makefile.in || die |
| 51 |
+ |
| 52 |
+ # Without thin-privision-tools, there is nothing to install for target install_man7: |
| 53 |
use thin || { sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die; } |
| 54 |
|
| 55 |
eautoreconf |
| 56 |
|
| 57 |
|
| 58 |
|
| 59 |
1.358 sys-fs/lvm2/ChangeLog |
| 60 |
|
| 61 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/ChangeLog?rev=1.358&view=markup |
| 62 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/ChangeLog?rev=1.358&content-type=text/plain |
| 63 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/ChangeLog?r1=1.357&r2=1.358 |
| 64 |
|
| 65 |
Index: ChangeLog |
| 66 |
=================================================================== |
| 67 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v |
| 68 |
retrieving revision 1.357 |
| 69 |
retrieving revision 1.358 |
| 70 |
diff -u -r1.357 -r1.358 |
| 71 |
--- ChangeLog 30 Jul 2014 17:11:27 -0000 1.357 |
| 72 |
+++ ChangeLog 30 Jul 2014 17:23:37 -0000 1.358 |
| 73 |
@@ -1,6 +1,13 @@ |
| 74 |
# ChangeLog for sys-fs/lvm2 |
| 75 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 76 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.357 2014/07/30 17:11:27 ssuominen Exp $ |
| 77 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.358 2014/07/30 17:23:37 ssuominen Exp $ |
| 78 |
+ |
| 79 |
+ 30 Jul 2014; Samuli Suominen <ssuominen@g.o> lvm2-2.02.108.ebuild: |
| 80 |
+ Use /bin/true instead of /usr/bin/true in |
| 81 |
+ scripts/blk_availability_systemd_red_hat.service.in because Gentoo doesn't |
| 82 |
+ have the so called usr -merge wrt #517514 by Markos Chandras. Enable |
| 83 |
+ "use_lvmetad = 1" by default in lvm.conf with USE="systemd lvmetad -device- |
| 84 |
+ mapper-only" wrt #514196 by Pacho Ramos. |
| 85 |
|
| 86 |
*lvm2-2.02.108 (30 Jul 2014) |
Archives