1 |
cardoe 08/01/30 14:37:06 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: lvm2-2.02.28-r5.ebuild |
5 |
Log: |
6 |
ignore rootfs entries in mount and mtab during shutdown. Fixes issues with shutting down in some cases. |
7 |
(Portage version: 2.1.4) |
8 |
|
9 |
Revision Changes Path |
10 |
1.126 sys-fs/lvm2/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/lvm2/ChangeLog?rev=1.126&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/lvm2/ChangeLog?rev=1.126&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/lvm2/ChangeLog?r1=1.125&r2=1.126 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v |
19 |
retrieving revision 1.125 |
20 |
retrieving revision 1.126 |
21 |
diff -u -r1.125 -r1.126 |
22 |
--- ChangeLog 29 Nov 2007 00:28:09 -0000 1.125 |
23 |
+++ ChangeLog 30 Jan 2008 14:37:05 -0000 1.126 |
24 |
@@ -1,6 +1,13 @@ |
25 |
# ChangeLog for sys-fs/lvm2 |
26 |
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.125 2007/11/29 00:28:09 robbat2 Exp $ |
28 |
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 |
29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.126 2008/01/30 14:37:05 cardoe Exp $ |
30 |
+ |
31 |
+*lvm2-2.02.28-r5 (30 Jan 2008) |
32 |
+ |
33 |
+ 30 Jan 2008; Doug Klima <cardoe@g.o> |
34 |
+ +files/lvm2-stop.sh-2.02.28-r5, +lvm2-2.02.28-r5.ebuild: |
35 |
+ ignore rootfs entries in mount and mtab during shutdown. Fixes issues with |
36 |
+ shutting down in some cases. |
37 |
|
38 |
*lvm2-2.02.28-r4 (29 Nov 2007) |
39 |
|
40 |
|
41 |
|
42 |
|
43 |
1.1 sys-fs/lvm2/lvm2-2.02.28-r5.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/lvm2/lvm2-2.02.28-r5.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/lvm2/lvm2-2.02.28-r5.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: lvm2-2.02.28-r5.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2008 Gentoo Foundation |
51 |
# Distributed under the terms of the GNU General Public License v2 |
52 |
# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.28-r5.ebuild,v 1.1 2008/01/30 14:37:05 cardoe Exp $ |
53 |
|
54 |
inherit eutils multilib |
55 |
|
56 |
DESCRIPTION="User-land utilities for LVM2 (device-mapper) software." |
57 |
HOMEPAGE="http://sources.redhat.com/lvm2/" |
58 |
SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz" |
59 |
|
60 |
LICENSE="GPL-2" |
61 |
SLOT="0" |
62 |
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" |
63 |
|
64 |
IUSE="readline static clvm cman gulm lvm1 selinux" |
65 |
|
66 |
DEPEND=">=sys-fs/device-mapper-1.02.22-r5 |
67 |
clvm? ( >=sys-cluster/dlm-1.01.00 |
68 |
cman? ( >=sys-cluster/cman-1.01.00 ) |
69 |
gulm? ( >=sys-cluster/gulm-1.00.00 ) )" |
70 |
|
71 |
RDEPEND="${DEPEND} |
72 |
!sys-fs/lvm-user |
73 |
!sys-fs/clvm" |
74 |
|
75 |
S="${WORKDIR}/${PN/lvm/LVM}.${PV}" |
76 |
|
77 |
pkg_setup() { |
78 |
use nolvmstatic && eerror "USE=nolvmstatic has changed to USE=static via package.use" |
79 |
use nolvm1 && eerror "USE=nolvm1 has changed to USE=lvm1 via package.use" |
80 |
} |
81 |
|
82 |
src_unpack() { |
83 |
unpack ${A} |
84 |
epatch "${FILESDIR}"/lvm.conf-2.02.28-r3.patch |
85 |
} |
86 |
|
87 |
src_compile() { |
88 |
# Static compile of lvm2 so that the install described in the handbook works |
89 |
# http://www.gentoo.org/doc/en/lvm2.xml |
90 |
# fixes http://bugs.gentoo.org/show_bug.cgi?id=84463 |
91 |
local myconf |
92 |
local buildmode |
93 |
|
94 |
# fsadm is broken, don't include it (2.02.28) |
95 |
myconf="${myconf} --enable-dmeventd --enable-cmdlib" |
96 |
|
97 |
# Most of this package does weird stuff. |
98 |
# The build options are tristate, and --without is NOT supported |
99 |
# options: 'none', 'internal', 'shared' |
100 |
if use static ; then |
101 |
einfo "Building static LVM, for usage inside genkernel" |
102 |
myconf="${myconf} --enable-static_link" |
103 |
buildmode="internal" |
104 |
else |
105 |
ewarn "Building shared LVM, it will not work inside genkernel!" |
106 |
buildmode="shared" |
107 |
fi |
108 |
|
109 |
# dmeventd requires mirrors to be internal, and snapshot available |
110 |
# so we cannot disable them |
111 |
myconf="${myconf} --with-mirrors=internal" |
112 |
myconf="${myconf} --with-snapshots=internal" |
113 |
|
114 |
if use lvm1 ; then |
115 |
myconf="${myconf} --with-lvm1=${buildmode}" |
116 |
else |
117 |
myconf="${myconf} --with-lvm1=none" |
118 |
fi |
119 |
|
120 |
# disable O_DIRECT support on hppa, breaks pv detection (#99532) |
121 |
use hppa && myconf="${myconf} --disable-o_direct" |
122 |
|
123 |
if use clvm; then |
124 |
myconf="${myconf} --with-cluster=${buildmode}" |
125 |
# 4-state! |
126 |
local clvmd="none" |
127 |
use cman && clvmd="cman" |
128 |
use gulm && clvmd="${clvmd}gulm" |
129 |
clvmd="${clvmd/cmangulm/all}" |
130 |
myconf="${myconf} --with-clvmd=${clvmd}" |
131 |
myconf="${myconf} --with-pool=${buildmode}" |
132 |
else |
133 |
myconf="${myconf} --with-clvmd=none --with-cluster=none" |
134 |
fi |
135 |
|
136 |
myconf="${myconf} --sbindir=/sbin --with-staticdir=/sbin" |
137 |
econf $(use_enable readline) \ |
138 |
$(use_enable selinux) \ |
139 |
--libdir=/usr/$(get_libdir) \ |
140 |
${myconf} || die |
141 |
emake || die "compile problem" |
142 |
} |
143 |
|
144 |
src_install() { |
145 |
emake DESTDIR="${D}" install |
146 |
# TODO: At some point in the future, we need to stop installing the static |
147 |
# as the /sbin/lvm name, and have both variants seperate. |
148 |
if use static; then |
149 |
cp -f "${D}"/sbin/lvm.static "${D}"/sbin/lvm \ |
150 |
|| die "Failed to copy lvm.static" |
151 |
fi |
152 |
|
153 |
dodir /$(get_libdir) |
154 |
# Put these in root so we can reach before /usr is up |
155 |
for i in libdevmapper-event-lvm2mirror liblvm2{format1,snapshot} ; do |
156 |
b="${D}"/usr/$(get_libdir)/${i} |
157 |
if [ -f "${b}".so ]; then |
158 |
mv -f "${b}".so* "${D}"/$(get_libdir) || die |
159 |
fi |
160 |
done |
161 |
|
162 |
dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt} |
163 |
insinto /lib/rcscripts/addons |
164 |
newins "${FILESDIR}"/lvm2-start.sh-2.02.28-r2 lvm-start.sh || die |
165 |
newins "${FILESDIR}"/lvm2-stop.sh-2.02.28-r5 lvm-stop.sh || die |
166 |
newinitd "${FILESDIR}"/lvm.rc-2.02.28-r2 lvm || die |
167 |
newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm || die |
168 |
if use clvm; then |
169 |
newinitd "${FILESDIR}"/clvmd.rc-2.02.28-r3 clvmd || die |
170 |
fi |
171 |
|
172 |
elog "use flag nocman is deprecated and replaced" |
173 |
elog "with cman and gulm use flags." |
174 |
elog "" |
175 |
elog "use flags clvm,cman and gulm are masked" |
176 |
elog "by default and need to be unmasked to use them" |
177 |
elog "" |
178 |
elog "Rebuild your genkernel initramfs if you are using lvm" |
179 |
use nolvmstatic && \ |
180 |
elog "USE=nolvmstatic has changed to USE=static via package.use" |
181 |
use nolvm1 && \ |
182 |
elog "USE=nolvm1 has changed to USE=lvm1 via package.use" |
183 |
} |
184 |
|
185 |
pkg_postinst() { |
186 |
elog "lvm volumes are no longer automatically created for" |
187 |
elog "baselayout-2 users. If you are using baselayout-2, be sure to" |
188 |
elog "run: # rc-update add lvm boot" |
189 |
} |
190 |
|
191 |
|
192 |
|
193 |
-- |
194 |
gentoo-commits@l.g.o mailing list |