1 |
robbat2 09/07/28 20:27:57 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: lvm2-2.02.49-r2.ebuild |
5 |
Log: |
6 |
Bug #278304: Update removal of vol_id, replaced by blkid -o udev. |
7 |
(Portage version: 2.2_rc33/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.166 sys-fs/lvm2/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/lvm2/ChangeLog?rev=1.166&view=markup |
13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/lvm2/ChangeLog?rev=1.166&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/lvm2/ChangeLog?r1=1.165&r2=1.166 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v |
19 |
retrieving revision 1.165 |
20 |
retrieving revision 1.166 |
21 |
diff -p -w -b -B -u -u -r1.165 -r1.166 |
22 |
--- ChangeLog 24 Jul 2009 23:37:37 -0000 1.165 |
23 |
+++ ChangeLog 28 Jul 2009 20:27:57 -0000 1.166 |
24 |
@@ -1,6 +1,12 @@ |
25 |
# ChangeLog for sys-fs/lvm2 |
26 |
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.165 2009/07/24 23:37:37 robbat2 Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.166 2009/07/28 20:27:57 robbat2 Exp $ |
29 |
+ |
30 |
+*lvm2-2.02.49-r2 (28 Jul 2009) |
31 |
+ |
32 |
+ 28 Jul 2009; Robin H. Johnson <robbat2@g.o> |
33 |
+ +files/64-device-mapper.rules-1.02.49-r2, +lvm2-2.02.49-r2.ebuild: |
34 |
+ Bug #278304: Update removal of vol_id, replaced by blkid -o udev. |
35 |
|
36 |
*lvm2-2.02.49-r1 (24 Jul 2009) |
37 |
|
38 |
|
39 |
|
40 |
|
41 |
1.1 sys-fs/lvm2/lvm2-2.02.49-r2.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/lvm2/lvm2-2.02.49-r2.ebuild?rev=1.1&view=markup |
44 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/lvm2/lvm2-2.02.49-r2.ebuild?rev=1.1&content-type=text/plain |
45 |
|
46 |
Index: lvm2-2.02.49-r2.ebuild |
47 |
=================================================================== |
48 |
# Copyright 1999-2009 Gentoo Foundation |
49 |
# Distributed under the terms of the GNU General Public License v2 |
50 |
# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.49-r2.ebuild,v 1.1 2009/07/28 20:27:57 robbat2 Exp $ |
51 |
|
52 |
EAPI=2 |
53 |
inherit eutils multilib toolchain-funcs autotools |
54 |
|
55 |
DESCRIPTION="User-land utilities for LVM2 (device-mapper) software." |
56 |
HOMEPAGE="http://sources.redhat.com/lvm2/" |
57 |
SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz |
58 |
ftp://sources.redhat.com/pub/lvm2/old/${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 lvm1 selinux" |
65 |
|
66 |
DEPEND="!sys-fs/device-mapper |
67 |
clvm? ( =sys-cluster/dlm-2* |
68 |
cman? ( =sys-cluster/cman-2* ) )" |
69 |
|
70 |
RDEPEND="${DEPEND} |
71 |
!sys-fs/lvm-user |
72 |
!sys-fs/clvm |
73 |
>=sys-apps/util-linux-2.16" |
74 |
|
75 |
S="${WORKDIR}/${PN/lvm/LVM}.${PV}" |
76 |
|
77 |
pkg_setup() { |
78 |
# 1. Genkernel no longer copies /sbin/lvm blindly. |
79 |
# 2. There are no longer any linking deps in /usr. |
80 |
if use static; then |
81 |
elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with" |
82 |
elog "their static versions. If you need the static binaries," |
83 |
elog "you must append .static the filename!" |
84 |
fi |
85 |
} |
86 |
|
87 |
src_unpack() { |
88 |
unpack ${A} |
89 |
} |
90 |
|
91 |
src_prepare() { |
92 |
epatch "${FILESDIR}"/${PN}-2.02.45-dmeventd.patch |
93 |
epatch "${FILESDIR}"/lvm.conf-2.02.45.patch |
94 |
epatch "${FILESDIR}"/${PN}-2.02.48-device-mapper-export-format.patch |
95 |
epatch "${FILESDIR}"/${PN}-2.02.48-as-needed.patch |
96 |
epatch "${FILESDIR}"/${PN}-2.02.48-fix-pkgconfig.patch |
97 |
epatch "${FILESDIR}"/${PN}-2.02.49-lockdir-override.patch |
98 |
eautoreconf |
99 |
} |
100 |
|
101 |
src_configure() { |
102 |
local myconf |
103 |
local buildmode |
104 |
|
105 |
myconf="${myconf} --enable-dmeventd" |
106 |
myconf="${myconf} --enable-cmdlib" |
107 |
myconf="${myconf} --enable-applib" |
108 |
myconf="${myconf} --enable-fsadm" |
109 |
|
110 |
# Most of this package does weird stuff. |
111 |
# The build options are tristate, and --without is NOT supported |
112 |
# options: 'none', 'internal', 'shared' |
113 |
if use static ; then |
114 |
einfo "Building static LVM, for usage inside genkernel" |
115 |
buildmode="internal" |
116 |
# This only causes the .static versions to become available |
117 |
# For recent systems, there are no linkages against anything in /usr anyway. |
118 |
# We explicitly provide the .static versions so that they can be included in |
119 |
# initramfs environments. |
120 |
myconf="${myconf} --enable-static_link" |
121 |
else |
122 |
ewarn "Building shared LVM, it will not work inside genkernel!" |
123 |
buildmode="shared" |
124 |
fi |
125 |
|
126 |
# dmeventd requires mirrors to be internal, and snapshot available |
127 |
# so we cannot disable them |
128 |
myconf="${myconf} --with-mirrors=internal" |
129 |
myconf="${myconf} --with-snapshots=internal" |
130 |
|
131 |
if use lvm1 ; then |
132 |
myconf="${myconf} --with-lvm1=${buildmode}" |
133 |
else |
134 |
myconf="${myconf} --with-lvm1=none" |
135 |
fi |
136 |
|
137 |
# disable O_DIRECT support on hppa, breaks pv detection (#99532) |
138 |
use hppa && myconf="${myconf} --disable-o_direct" |
139 |
|
140 |
if use clvm; then |
141 |
myconf="${myconf} --with-cluster=${buildmode}" |
142 |
# 4-state! Make sure we get it right, per bug 210879 |
143 |
# Valid options are: none, cman, gulm, all |
144 |
# |
145 |
# 2009/02: |
146 |
# gulm is removed now, now dual-state: |
147 |
# cman, none |
148 |
# all still exists, but is not needed |
149 |
# |
150 |
# 2009/07: |
151 |
# TODO: add corosync and re-enable ALL |
152 |
local clvmd="" |
153 |
use cman && clvmd="cman" |
154 |
#clvmd="${clvmd/cmangulm/all}" |
155 |
[ -z "${clvmd}" ] && clvmd="none" |
156 |
myconf="${myconf} --with-clvmd=${clvmd}" |
157 |
myconf="${myconf} --with-pool=${buildmode}" |
158 |
else |
159 |
myconf="${myconf} --with-clvmd=none --with-cluster=none" |
160 |
fi |
161 |
|
162 |
myconf="${myconf} --sbindir=/sbin --with-staticdir=/sbin" |
163 |
econf $(use_enable readline) \ |
164 |
$(use_enable selinux) \ |
165 |
--enable-pkgconfig \ |
166 |
--libdir=/usr/$(get_libdir) \ |
167 |
${myconf} \ |
168 |
CLDFLAGS="${LDFLAGS}" || die |
169 |
} |
170 |
|
171 |
src_compile() { |
172 |
einfo "Doing symlinks" |
173 |
pushd include |
174 |
emake || die "Failed to prepare symlinks" |
175 |
popd |
176 |
|
177 |
einfo "Doing device-mapper" |
178 |
pushd libdm |
179 |
emake || die "failed to build libdm" |
180 |
#emake ioctl/libdevmapper.a || die "failed to build libdm/ioctl/libdevmapper.a" |
181 |
popd |
182 |
|
183 |
einfo "Doing lib" |
184 |
pushd lib |
185 |
emake || die "failed to build lib" |
186 |
popd |
187 |
|
188 |
einfo "Doing main build" |
189 |
emake || die "compile problem" |
190 |
} |
191 |
|
192 |
src_install() { |
193 |
emake DESTDIR="${D}" install |
194 |
|
195 |
dodir /$(get_libdir) |
196 |
# Put these in root so we can reach before /usr is up |
197 |
for i in \ |
198 |
libdevmapper-event{,-lvm2{mirror,snapshot}} \ |
199 |
libdevmapper \ |
200 |
liblvm2{format1,snapshot,cmd} \ |
201 |
; do |
202 |
b="${D}"/usr/$(get_libdir)/${i} |
203 |
if [ -f "${b}".so ]; then |
204 |
mv -f "${b}".so* "${D}"/$(get_libdir) || die |
205 |
gen_usr_ldscript ${i}.so || die |
206 |
fi |
207 |
done |
208 |
|
209 |
dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt} |
210 |
insinto /$(get_libdir)/rcscripts/addons |
211 |
newins "${FILESDIR}"/lvm2-start.sh-2.02.49-r1 lvm-start.sh || die |
212 |
newins "${FILESDIR}"/lvm2-stop.sh-2.02.49-r1 lvm-stop.sh || die |
213 |
newinitd "${FILESDIR}"/lvm.rc-2.02.28-r2 lvm || die |
214 |
newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm || die |
215 |
if use clvm; then |
216 |
newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd || die |
217 |
newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd || die |
218 |
fi |
219 |
|
220 |
# move shared libs to /lib(64) |
221 |
if use static; then |
222 |
dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a libdevmapper.a" |
223 |
fi |
224 |
#gen_usr_ldscript libdevmapper.so |
225 |
|
226 |
insinto /etc |
227 |
doins "${FILESDIR}"/dmtab |
228 |
insinto /$(get_libdir)/rcscripts/addons |
229 |
doins "${FILESDIR}"/dm-start.sh |
230 |
|
231 |
# Device mapper stuff |
232 |
newinitd "${FILESDIR}"/device-mapper.rc-1.02.22-r3 device-mapper || die |
233 |
newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper || die |
234 |
|
235 |
newinitd "${FILESDIR}"/1.02.22-dmeventd.initd dmeventd || die |
236 |
if use static; then |
237 |
dolib.a daemons/dmeventd/libdevmapper-event.a \ |
238 |
|| die "dolib.a libdevmapper-event.a" |
239 |
fi |
240 |
#gen_usr_ldscript libdevmapper-event.so |
241 |
|
242 |
insinto /etc/udev/rules.d/ |
243 |
newins "${FILESDIR}"/64-device-mapper.rules-1.02.49-r2 64-device-mapper.rules || die |
244 |
|
245 |
elog "USE flag nocman is deprecated and replaced" |
246 |
elog "with the cman USE flag." |
247 |
elog "" |
248 |
elog "USE flags clvm and cman are masked" |
249 |
elog "by default and need to be unmasked to use them" |
250 |
elog "" |
251 |
elog "Rebuild your genkernel initramfs if you are using lvm" |
252 |
} |
253 |
|
254 |
pkg_postinst() { |
255 |
elog "lvm volumes are no longer automatically created for" |
256 |
elog "baselayout-2 users. If you are using baselayout-2, be sure to" |
257 |
elog "run: # rc-update add lvm boot" |
258 |
elog "Do NOT add it if you are using baselayout-1 still." |
259 |
} |
260 |
|
261 |
src_test() { |
262 |
einfo "Testcases disabled because of device-node mucking" |
263 |
einfo "If you want them, compile the package and see ${S}/tests" |
264 |
} |