1 |
ssuominen 13/08/01 19:02:35 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: lvm2-2.02.99.ebuild |
5 |
Log: |
6 |
Version bump wrt #478452. Include upstream systemd files wrt #453594 by Enrico Tagliavini. Install libdaemonclient.a with USE="static-libs" wrt #462908 by Oleksii Shevchuk. |
7 |
|
8 |
(Portage version: 2.2.0_alpha188/cvs/Linux x86_64, signed Manifest commit with key 4868F14D) |
9 |
|
10 |
Revision Changes Path |
11 |
1.305 sys-fs/lvm2/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/ChangeLog?rev=1.305&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/ChangeLog?rev=1.305&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/ChangeLog?r1=1.304&r2=1.305 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v |
20 |
retrieving revision 1.304 |
21 |
retrieving revision 1.305 |
22 |
diff -u -r1.304 -r1.305 |
23 |
--- ChangeLog 1 Aug 2013 00:10:37 -0000 1.304 |
24 |
+++ ChangeLog 1 Aug 2013 19:02:35 -0000 1.305 |
25 |
@@ -1,6 +1,15 @@ |
26 |
# ChangeLog for sys-fs/lvm2 |
27 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.304 2013/08/01 00:10:37 axs Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.305 2013/08/01 19:02:35 ssuominen Exp $ |
30 |
+ |
31 |
+*lvm2-2.02.99 (01 Aug 2013) |
32 |
+ |
33 |
+ 01 Aug 2013; Samuli Suominen <ssuominen@g.o> +lvm2-2.02.99.ebuild, |
34 |
+ +files/lvm2-2.02.99-example.conf.in.patch, |
35 |
+ +files/lvm2-2.02.99-locale-muck.patch: |
36 |
+ Version bump wrt #478452. Include upstream systemd files wrt #453594 by |
37 |
+ Enrico Tagliavini. Install libdaemonclient.a with USE="static-libs" wrt |
38 |
+ #462908 by Oleksii Shevchuk. |
39 |
|
40 |
01 Aug 2013; Ian Stakenvicius <axs@g.o> |
41 |
+files/lvm2-2.02.97-udev-static.patch, lvm2-2.02.97-r1.ebuild, |
42 |
|
43 |
|
44 |
|
45 |
1.1 sys-fs/lvm2/lvm2-2.02.99.ebuild |
46 |
|
47 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/lvm2-2.02.99.ebuild?rev=1.1&view=markup |
48 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/lvm2-2.02.99.ebuild?rev=1.1&content-type=text/plain |
49 |
|
50 |
Index: lvm2-2.02.99.ebuild |
51 |
=================================================================== |
52 |
# Copyright 1999-2013 Gentoo Foundation |
53 |
# Distributed under the terms of the GNU General Public License v2 |
54 |
# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.99.ebuild,v 1.1 2013/08/01 19:02:35 ssuominen Exp $ |
55 |
|
56 |
EAPI=5 |
57 |
inherit eutils multilib toolchain-funcs autotools linux-info udev systemd |
58 |
|
59 |
DESCRIPTION="User-land utilities for LVM2 (device-mapper) software." |
60 |
HOMEPAGE="http://sources.redhat.com/lvm2/" |
61 |
SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz |
62 |
ftp://sources.redhat.com/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz" |
63 |
|
64 |
LICENSE="GPL-2" |
65 |
SLOT="0" |
66 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" |
67 |
|
68 |
IUSE="readline static static-libs clvm cman +lvm1 selinux +udev +thin" |
69 |
|
70 |
DEPEND_COMMON="readline? ( sys-libs/readline ) |
71 |
clvm? ( =sys-cluster/libdlm-3* |
72 |
cman? ( =sys-cluster/cman-3* ) ) |
73 |
udev? ( virtual/udev[static-libs?] )" |
74 |
# /run is now required for locking during early boot. /var cannot be assumed to |
75 |
# be available. |
76 |
RDEPEND="${DEPEND_COMMON} |
77 |
!<sys-apps/openrc-0.10.1 |
78 |
>=sys-apps/baselayout-2.1-r1 |
79 |
!!sys-fs/lvm-user |
80 |
!!sys-fs/clvm |
81 |
>=sys-apps/util-linux-2.16 |
82 |
thin? ( sys-block/thin-provisioning-tools )" |
83 |
# Upgrading to this LVM will break older cryptsetup |
84 |
RDEPEND="${RDEPEND} |
85 |
!<sys-fs/cryptsetup-1.1.2" |
86 |
DEPEND="${DEPEND_COMMON} |
87 |
virtual/pkgconfig |
88 |
>=sys-devel/binutils-2.20.1-r1 |
89 |
static? ( udev? ( virtual/udev[static-libs] ) )" |
90 |
|
91 |
S=${WORKDIR}/${PN/lvm/LVM}.${PV} |
92 |
|
93 |
pkg_setup() { |
94 |
local CONFIG_CHECK="~SYSVIPC" |
95 |
use udev && local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n" |
96 |
check_extra_config |
97 |
# 1. Genkernel no longer copies /sbin/lvm blindly. |
98 |
if use static; then |
99 |
elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with" |
100 |
elog "their static versions. If you need the static binaries," |
101 |
elog "you must append .static to the filename!" |
102 |
fi |
103 |
} |
104 |
|
105 |
src_prepare() { |
106 |
# Gentoo specific modification(s) |
107 |
epatch "${FILESDIR}"/${PN}-2.02.99-example.conf.in.patch |
108 |
|
109 |
# Not merged upstream, should be reviewed and forwarded: |
110 |
epatch \ |
111 |
"${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch \ |
112 |
"${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch \ |
113 |
"${FILESDIR}"/${PN}-2.02.88-respect-cc.patch |
114 |
epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331 |
115 |
epatch "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373 |
116 |
epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed |
117 |
epatch "${FILESDIR}"/${PN}-2.02.92-dynamic-static-ldflags.patch #332905 |
118 |
epatch "${FILESDIR}"/${PN}-2.02.97-udev-static.patch #370217 |
119 |
|
120 |
# Fix calling AR directly with USE static, bug #444082, convert to patch and forward to upstream |
121 |
if use static ; then |
122 |
sed -i -e "s:\$(AR) rs \$@ \$(OBJECTS) lvmcmdlib.o lvm2cmd-static.o:$(tc-getAR) rs \$@ \$(OBJECTS) lvmcmdlib.o lvm2cmd-static.o:" \ |
123 |
tools/Makefile.in || die |
124 |
fi |
125 |
|
126 |
eautoreconf |
127 |
} |
128 |
|
129 |
src_configure() { |
130 |
local myconf |
131 |
local buildmode |
132 |
|
133 |
myconf="${myconf} --enable-dmeventd" |
134 |
myconf="${myconf} --enable-cmdlib" |
135 |
myconf="${myconf} --enable-applib" |
136 |
myconf="${myconf} --enable-fsadm" |
137 |
myconf="${myconf} --enable-lvmetad" |
138 |
|
139 |
# Most of this package does weird stuff. |
140 |
# The build options are tristate, and --without is NOT supported |
141 |
# options: 'none', 'internal', 'shared' |
142 |
if use static ; then |
143 |
einfo "Building static LVM, for usage inside genkernel" |
144 |
buildmode="internal" |
145 |
# This only causes the .static versions to become available |
146 |
# We explicitly provide the .static versions so that they can be included in |
147 |
# initramfs environments. |
148 |
myconf="${myconf} --enable-static_link" |
149 |
else |
150 |
ewarn "Building shared LVM, it will not work inside genkernel!" |
151 |
buildmode="shared" |
152 |
fi |
153 |
|
154 |
# dmeventd requires mirrors to be internal, and snapshot available |
155 |
# so we cannot disable them |
156 |
myconf="${myconf} --with-mirrors=internal" |
157 |
myconf="${myconf} --with-snapshots=internal" |
158 |
use thin \ |
159 |
&& myconf="${myconf} --with-thin=internal" \ |
160 |
|| myconf="${myconf} --with-thin=none" |
161 |
|
162 |
if use lvm1 ; then |
163 |
myconf="${myconf} --with-lvm1=${buildmode}" |
164 |
else |
165 |
myconf="${myconf} --with-lvm1=none" |
166 |
fi |
167 |
|
168 |
# disable O_DIRECT support on hppa, breaks pv detection (#99532) |
169 |
use hppa && myconf="${myconf} --disable-o_direct" |
170 |
|
171 |
if use clvm; then |
172 |
myconf="${myconf} --with-cluster=${buildmode}" |
173 |
# 4-state! Make sure we get it right, per bug 210879 |
174 |
# Valid options are: none, cman, gulm, all |
175 |
# |
176 |
# 2009/02: |
177 |
# gulm is removed now, now dual-state: |
178 |
# cman, none |
179 |
# all still exists, but is not needed |
180 |
# |
181 |
# 2009/07: |
182 |
# TODO: add corosync and re-enable ALL |
183 |
local clvmd="" |
184 |
use cman && clvmd="cman" |
185 |
#clvmd="${clvmd/cmangulm/all}" |
186 |
[ -z "${clvmd}" ] && clvmd="none" |
187 |
myconf="${myconf} --with-clvmd=${clvmd}" |
188 |
myconf="${myconf} --with-pool=${buildmode}" |
189 |
else |
190 |
myconf="${myconf} --with-clvmd=none --with-cluster=none" |
191 |
fi |
192 |
|
193 |
local udevdir="${EPREFIX}/lib/udev/rules.d" |
194 |
use udev && udevdir="${EPREFIX}/$(get_udevdir)/rules.d" |
195 |
|
196 |
econf \ |
197 |
$(use_enable readline) \ |
198 |
$(use_enable selinux) \ |
199 |
--enable-pkgconfig \ |
200 |
--with-confdir="${EPREFIX}/etc" \ |
201 |
--sbindir="${EPREFIX}/sbin" \ |
202 |
--with-staticdir="${EPREFIX}/sbin" \ |
203 |
--libdir="${EPREFIX}/$(get_libdir)" \ |
204 |
--with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \ |
205 |
--with-default-run-dir=/run/lvm \ |
206 |
--with-default-locking-dir=/run/lock/lvm \ |
207 |
--with-dmeventd-path=/sbin/dmeventd \ |
208 |
$(use_enable udev udev_rules) \ |
209 |
$(use_enable udev udev_sync) \ |
210 |
$(use_with udev udevdir "${udevdir}") \ |
211 |
"$(systemd_with_unitdir)" \ |
212 |
${myconf} \ |
213 |
CLDFLAGS="${LDFLAGS}" |
214 |
} |
215 |
|
216 |
src_compile() { |
217 |
einfo "Doing symlinks" |
218 |
pushd include >/dev/null |
219 |
emake |
220 |
popd >/dev/null |
221 |
|
222 |
einfo "Starting main build" |
223 |
emake AR="$(tc-getAR)" |
224 |
} |
225 |
|
226 |
src_install() { |
227 |
local inst |
228 |
for inst in install install_systemd_units install_systemd_generators install_tmpfiles_configuration; do |
229 |
emake DESTDIR="${D}" ${inst} |
230 |
done |
231 |
|
232 |
dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf |
233 |
newinitd "${FILESDIR}"/lvm.rc-2.02.95-r2 lvm |
234 |
newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.67-r2 lvm-monitoring |
235 |
newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm |
236 |
if use clvm; then |
237 |
newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd |
238 |
newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd |
239 |
fi |
240 |
|
241 |
# move shared libs to /lib(64) |
242 |
if use static-libs; then |
243 |
dolib.a libdm/ioctl/libdevmapper.a |
244 |
dolib.a libdaemon/client/libdaemonclient.a #462908 |
245 |
#gen_usr_ldscript libdevmapper.so |
246 |
fi |
247 |
|
248 |
dosbin "${S}"/scripts/lvm2create_initrd/lvm2create_initrd |
249 |
doman "${S}"/scripts/lvm2create_initrd/lvm2create_initrd.8 |
250 |
newdoc "${S}"/scripts/lvm2create_initrd/README README.lvm2create_initrd |
251 |
|
252 |
insinto /etc |
253 |
doins "${FILESDIR}"/dmtab |
254 |
|
255 |
# Device mapper stuff |
256 |
newinitd "${FILESDIR}"/device-mapper.rc-2.02.95-r2 device-mapper |
257 |
newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper |
258 |
|
259 |
newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd |
260 |
if use static-libs; then |
261 |
dolib.a daemons/dmeventd/libdevmapper-event.a |
262 |
#gen_usr_ldscript libdevmapper-event.so |
263 |
fi |
264 |
|
265 |
use static-libs || \ |
266 |
rm -f "${D}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a |
267 |
|
268 |
#insinto /etc/udev/rules.d/ |
269 |
#newins "${FILESDIR}"/64-device-mapper.rules-2.02.56-r3 64-device-mapper.rules |
270 |
|
271 |
# do not rely on /lib -> /libXX link |
272 |
sed -i \ |
273 |
-e "s|/lib/rcscripts/|/$(get_libdir)/rcscripts/|" \ |
274 |
"${ED}"/etc/init.d/* || die |
275 |
|
276 |
elog "USE flag nocman is deprecated and replaced" |
277 |
elog "with the cman USE flag." |
278 |
elog "" |
279 |
elog "USE flags clvm and cman are masked" |
280 |
elog "by default and need to be unmasked to be used" |
281 |
elog "" |
282 |
elog "If you are using genkernel and root-on-LVM, rebuild the initramfs." |
283 |
} |
284 |
|
285 |
pkg_postinst() { |
286 |
elog "lvm volumes are no longer automatically created for" |
287 |
elog "baselayout-2 users. If you are using baselayout-2, be sure to" |
288 |
elog "run: # rc-update add lvm boot" |
289 |
elog "Do NOT add it if you are still using baselayout-1." |
290 |
} |
291 |
|
292 |
src_test() { |
293 |
einfo "Testcases disabled because of device-node mucking" |
294 |
einfo "If you want them, compile the package and see ${S}/tests" |
295 |
} |