1 |
robbat2 12/03/01 06:25:34 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: lvm2-2.02.93.ebuild |
5 |
Log: |
6 |
version bump. |
7 |
|
8 |
(Portage version: 2.2.0_alpha89/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.260 sys-fs/lvm2/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/ChangeLog?rev=1.260&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/ChangeLog?rev=1.260&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/ChangeLog?r1=1.259&r2=1.260 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v |
20 |
retrieving revision 1.259 |
21 |
retrieving revision 1.260 |
22 |
diff -p -w -b -B -u -u -r1.259 -r1.260 |
23 |
--- ChangeLog 25 Feb 2012 15:17:50 -0000 1.259 |
24 |
+++ ChangeLog 1 Mar 2012 06:25:34 -0000 1.260 |
25 |
@@ -1,6 +1,11 @@ |
26 |
# ChangeLog for sys-fs/lvm2 |
27 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.259 2012/02/25 15:17:50 ssuominen Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.260 2012/03/01 06:25:34 robbat2 Exp $ |
30 |
+ |
31 |
+*lvm2-2.02.93 (01 Mar 2012) |
32 |
+ |
33 |
+ 01 Mar 2012; Robin H. Johnson <robbat2@g.o> +lvm2-2.02.93.ebuild: |
34 |
+ version bump. |
35 |
|
36 |
25 Feb 2012; Samuli Suominen <ssuominen@g.o> lvm2-2.02.88.ebuild: |
37 |
ppc64 stable wrt #400557 |
38 |
|
39 |
|
40 |
|
41 |
1.1 sys-fs/lvm2/lvm2-2.02.93.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/lvm2-2.02.93.ebuild?rev=1.1&view=markup |
44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/lvm2-2.02.93.ebuild?rev=1.1&content-type=text/plain |
45 |
|
46 |
Index: lvm2-2.02.93.ebuild |
47 |
=================================================================== |
48 |
# Copyright 1999-2012 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.93.ebuild,v 1.1 2012/03/01 06:25:34 robbat2 Exp $ |
51 |
|
52 |
EAPI=3 |
53 |
inherit eutils multilib toolchain-funcs autotools linux-info |
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 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux" |
63 |
|
64 |
IUSE="readline +static +static-libs clvm cman +lvm1 selinux" |
65 |
|
66 |
DEPEND_COMMON="!!sys-fs/device-mapper |
67 |
readline? ( sys-libs/readline ) |
68 |
clvm? ( =sys-cluster/dlm-2* |
69 |
cman? ( =sys-cluster/cman-2* ) ) |
70 |
>=sys-fs/udev-151-r4" |
71 |
|
72 |
RDEPEND="${DEPEND_COMMON} |
73 |
!<sys-apps/openrc-0.4 |
74 |
!!sys-fs/lvm-user |
75 |
!!sys-fs/clvm |
76 |
>=sys-apps/util-linux-2.16" |
77 |
|
78 |
# Upgrading to this LVM will break older cryptsetup |
79 |
RDEPEND="${RDEPEND} |
80 |
!<sys-fs/cryptsetup-1.1.2" |
81 |
|
82 |
DEPEND="${DEPEND_COMMON} |
83 |
dev-util/pkgconfig |
84 |
>=sys-devel/binutils-2.20.1-r1" |
85 |
|
86 |
S="${WORKDIR}/${PN/lvm/LVM}.${PV}" |
87 |
|
88 |
pkg_setup() { |
89 |
local CONFIG_CHECK="~SYSVIPC" |
90 |
local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n" |
91 |
check_extra_config |
92 |
# 1. Genkernel no longer copies /sbin/lvm blindly. |
93 |
# 2. There are no longer any linking deps in /usr. |
94 |
if use static; then |
95 |
elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with" |
96 |
elog "their static versions. If you need the static binaries," |
97 |
elog "you must append .static to the filename!" |
98 |
fi |
99 |
} |
100 |
|
101 |
src_unpack() { |
102 |
unpack ${A} |
103 |
} |
104 |
|
105 |
src_prepare() { |
106 |
epatch "${FILESDIR}"/lvm.conf-2.02.67.patch |
107 |
|
108 |
# Should not be needed due to upstream re-arrangement of build |
109 |
#epatch "${FILESDIR}"/${PN}-2.02.56-dmeventd.patch |
110 |
# Should not be need with new upstream udev rules |
111 |
#epatch "${FILESDIR}"/${PN}-2.02.56-device-mapper-export-format.patch |
112 |
|
113 |
# Merged upstream: |
114 |
#epatch "${FILESDIR}"/${PN}-2.02.51-as-needed.patch |
115 |
# Merged upstream: |
116 |
#epatch "${FILESDIR}"/${PN}-2.02.48-fix-pkgconfig.patch |
117 |
# Merged upstream: |
118 |
#epatch "${FILESDIR}"/${PN}-2.02.51-fix-pvcreate.patch |
119 |
# Fixed differently upstream: |
120 |
#epatch "${FILESDIR}"/${PN}-2.02.51-dmsetup-selinux-linking-fix-r3.patch |
121 |
|
122 |
epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch |
123 |
epatch "${FILESDIR}"/lvm2-2.02.56-lvm2create_initrd.patch |
124 |
# bug 318513 |
125 |
epatch "${FILESDIR}"/${PN}-2.02.64-dmeventd-libs.patch |
126 |
# bug 301331 |
127 |
epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch |
128 |
# bug 330373 |
129 |
epatch "${FILESDIR}"/${PN}-2.02.92-locale-muck.patch |
130 |
# --as-needed |
131 |
epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch |
132 |
# bug 332905 |
133 |
epatch "${FILESDIR}"/${PN}-2.02.92-dynamic-static-ldflags.patch |
134 |
# bug 361429 - merged upstream in .85 |
135 |
#epatch "${FILESDIR}"/${PN}-2.02.84-udev-pkgconfig.patch |
136 |
|
137 |
# Merged upstream |
138 |
#epatch "${FILESDIR}"/${PN}-2.02.73-asneeded.patch |
139 |
|
140 |
eautoreconf |
141 |
} |
142 |
|
143 |
src_configure() { |
144 |
local myconf |
145 |
local buildmode |
146 |
|
147 |
myconf="${myconf} --enable-dmeventd" |
148 |
myconf="${myconf} --enable-cmdlib" |
149 |
myconf="${myconf} --enable-applib" |
150 |
myconf="${myconf} --enable-fsadm" |
151 |
#myconf="${myconf} --enable-lvmetad" # still broken |
152 |
|
153 |
# Most of this package does weird stuff. |
154 |
# The build options are tristate, and --without is NOT supported |
155 |
# options: 'none', 'internal', 'shared' |
156 |
if use static ; then |
157 |
einfo "Building static LVM, for usage inside genkernel" |
158 |
buildmode="internal" |
159 |
# This only causes the .static versions to become available |
160 |
# For recent systems, there are no linkages against anything in /usr anyway. |
161 |
# We explicitly provide the .static versions so that they can be included in |
162 |
# initramfs environments. |
163 |
myconf="${myconf} --enable-static_link" |
164 |
else |
165 |
ewarn "Building shared LVM, it will not work inside genkernel!" |
166 |
buildmode="shared" |
167 |
fi |
168 |
|
169 |
# dmeventd requires mirrors to be internal, and snapshot available |
170 |
# so we cannot disable them |
171 |
myconf="${myconf} --with-mirrors=internal" |
172 |
myconf="${myconf} --with-snapshots=internal" |
173 |
myconf="${myconf} --with-thin=internal" |
174 |
|
175 |
if use lvm1 ; then |
176 |
myconf="${myconf} --with-lvm1=${buildmode}" |
177 |
else |
178 |
myconf="${myconf} --with-lvm1=none" |
179 |
fi |
180 |
|
181 |
# disable O_DIRECT support on hppa, breaks pv detection (#99532) |
182 |
use hppa && myconf="${myconf} --disable-o_direct" |
183 |
|
184 |
if use clvm; then |
185 |
myconf="${myconf} --with-cluster=${buildmode}" |
186 |
# 4-state! Make sure we get it right, per bug 210879 |
187 |
# Valid options are: none, cman, gulm, all |
188 |
# |
189 |
# 2009/02: |
190 |
# gulm is removed now, now dual-state: |
191 |
# cman, none |
192 |
# all still exists, but is not needed |
193 |
# |
194 |
# 2009/07: |
195 |
# TODO: add corosync and re-enable ALL |
196 |
local clvmd="" |
197 |
use cman && clvmd="cman" |
198 |
#clvmd="${clvmd/cmangulm/all}" |
199 |
[ -z "${clvmd}" ] && clvmd="none" |
200 |
myconf="${myconf} --with-clvmd=${clvmd}" |
201 |
myconf="${myconf} --with-pool=${buildmode}" |
202 |
else |
203 |
myconf="${myconf} --with-clvmd=none --with-cluster=none" |
204 |
fi |
205 |
|
206 |
myconf="${myconf} |
207 |
--with-dmeventd-path=/sbin/dmeventd" |
208 |
econf $(use_enable readline) \ |
209 |
$(use_enable selinux) \ |
210 |
--enable-pkgconfig \ |
211 |
--with-confdir="${EPREFIX}/etc" \ |
212 |
--sbindir="${EPREFIX}/sbin" \ |
213 |
--with-staticdir="${EPREFIX}/sbin" \ |
214 |
--libdir="${EPREFIX}/$(get_libdir)" \ |
215 |
--with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \ |
216 |
--enable-udev_rules \ |
217 |
--enable-udev_sync \ |
218 |
--with-udevdir="${EPREFIX}/lib/udev/rules.d/" \ |
219 |
${myconf} \ |
220 |
CLDFLAGS="${LDFLAGS}" || die |
221 |
} |
222 |
|
223 |
src_compile() { |
224 |
einfo "Doing symlinks" |
225 |
pushd include |
226 |
emake || die "Failed to prepare symlinks" |
227 |
popd |
228 |
|
229 |
einfo "Starting main build" |
230 |
emake || die "compile fail" |
231 |
} |
232 |
|
233 |
src_install() { |
234 |
emake DESTDIR="${D}" install || die "Failed to emake install" |
235 |
|
236 |
dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{conf,c,txt} |
237 |
insinto /$(get_libdir)/rcscripts/addons |
238 |
newins "${FILESDIR}"/lvm2-start.sh-2.02.67-r1 lvm-start.sh || die |
239 |
newins "${FILESDIR}"/lvm2-stop.sh-2.02.67-r1 lvm-stop.sh || die |
240 |
newinitd "${FILESDIR}"/lvm.rc-2.02.67-r1 lvm || die |
241 |
newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.67-r2 lvm-monitoring || die |
242 |
newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm || die |
243 |
if use clvm; then |
244 |
newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd || die |
245 |
newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd || die |
246 |
fi |
247 |
|
248 |
# move shared libs to /lib(64) |
249 |
if use static-libs; then |
250 |
dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a libdevmapper.a" |
251 |
#gen_usr_ldscript libdevmapper.so |
252 |
fi |
253 |
|
254 |
dosbin "${S}"/scripts/lvm2create_initrd/lvm2create_initrd |
255 |
doman "${S}"/scripts/lvm2create_initrd/lvm2create_initrd.8 |
256 |
newdoc "${S}"/scripts/lvm2create_initrd/README README.lvm2create_initrd |
257 |
|
258 |
insinto /etc |
259 |
doins "${FILESDIR}"/dmtab |
260 |
insinto /$(get_libdir)/rcscripts/addons |
261 |
doins "${FILESDIR}"/dm-start.sh |
262 |
|
263 |
# Device mapper stuff |
264 |
newinitd "${FILESDIR}"/device-mapper.rc-2.02.67-r1 device-mapper || die |
265 |
newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper || die |
266 |
|
267 |
newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd || die |
268 |
if use static-libs; then |
269 |
dolib.a daemons/dmeventd/libdevmapper-event.a \ |
270 |
|| die "dolib.a libdevmapper-event.a" |
271 |
#gen_usr_ldscript libdevmapper-event.so |
272 |
fi |
273 |
|
274 |
use static-libs || \ |
275 |
rm -f "${D}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a |
276 |
|
277 |
#insinto /etc/udev/rules.d/ |
278 |
#newins "${FILESDIR}"/64-device-mapper.rules-2.02.56-r3 64-device-mapper.rules || die |
279 |
|
280 |
# do not rely on /lib -> /libXX link |
281 |
sed -e "s-/lib/rcscripts/-/$(get_libdir)/rcscripts/-" -i "${ED}"/etc/init.d/* |
282 |
|
283 |
elog "USE flag nocman is deprecated and replaced" |
284 |
elog "with the cman USE flag." |
285 |
elog "" |
286 |
elog "USE flags clvm and cman are masked" |
287 |
elog "by default and need to be unmasked to be used" |
288 |
elog "" |
289 |
elog "If you are using genkernel and root-on-LVM, rebuild the initramfs." |
290 |
} |
291 |
|
292 |
pkg_postinst() { |
293 |
elog "lvm volumes are no longer automatically created for" |
294 |
elog "baselayout-2 users. If you are using baselayout-2, be sure to" |
295 |
elog "run: # rc-update add lvm boot" |
296 |
elog "Do NOT add it if you are still using baselayout-1." |
297 |
} |
298 |
|
299 |
src_test() { |
300 |
einfo "Testcases disabled because of device-node mucking" |
301 |
einfo "If you want them, compile the package and see ${S}/tests" |
302 |
} |