1 |
ssuominen 14/08/29 05:24:56 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: lvm2-2.02.110.ebuild |
5 |
Log: |
6 |
Version bump. Enable "use_lvmetad = 1" by default also for non-systemd users. |
7 |
|
8 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key 4868F14D) |
9 |
|
10 |
Revision Changes Path |
11 |
1.370 sys-fs/lvm2/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/ChangeLog?rev=1.370&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/ChangeLog?rev=1.370&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/ChangeLog?r1=1.369&r2=1.370 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v |
20 |
retrieving revision 1.369 |
21 |
retrieving revision 1.370 |
22 |
diff -u -r1.369 -r1.370 |
23 |
--- ChangeLog 27 Aug 2014 09:10:15 -0000 1.369 |
24 |
+++ ChangeLog 29 Aug 2014 05:24:56 -0000 1.370 |
25 |
@@ -1,6 +1,11 @@ |
26 |
# ChangeLog for sys-fs/lvm2 |
27 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.369 2014/08/27 09:10:15 ssuominen Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.370 2014/08/29 05:24:56 ssuominen Exp $ |
30 |
+ |
31 |
+*lvm2-2.02.110 (29 Aug 2014) |
32 |
+ |
33 |
+ 29 Aug 2014; Samuli Suominen <ssuominen@g.o> +lvm2-2.02.110.ebuild: |
34 |
+ Version bump. Enable "use_lvmetad = 1" by default also for non-systemd users. |
35 |
|
36 |
27 Aug 2014; Samuli Suominen <ssuominen@g.o> lvm2-2.02.109.ebuild: |
37 |
Restrict old 2.02.109-r0 to old sys-apps/util-linux < 2.25 for USE="static" |
38 |
|
39 |
|
40 |
|
41 |
1.1 sys-fs/lvm2/lvm2-2.02.110.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/lvm2-2.02.110.ebuild?rev=1.1&view=markup |
44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/lvm2-2.02.110.ebuild?rev=1.1&content-type=text/plain |
45 |
|
46 |
Index: lvm2-2.02.110.ebuild |
47 |
=================================================================== |
48 |
# Copyright 1999-2014 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.110.ebuild,v 1.1 2014/08/29 05:24:56 ssuominen Exp $ |
51 |
|
52 |
EAPI=5 |
53 |
inherit autotools eutils linux-info multilib systemd toolchain-funcs udev flag-o-matic |
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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" |
63 |
IUSE="readline static static-libs systemd clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only" |
64 |
REQUIRED_USE="device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin ) |
65 |
static? ( !udev )" #520450 |
66 |
|
67 |
DEPEND_COMMON="clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) |
68 |
readline? ( sys-libs/readline ) |
69 |
udev? ( >=virtual/libudev-208:=[static-libs?] )" |
70 |
# /run is now required for locking during early boot. /var cannot be assumed to |
71 |
# be available -- thus, pull in recent enough baselayout for /run. |
72 |
# This version of LVM is incompatible with cryptsetup <1.1.2. |
73 |
RDEPEND="${DEPEND_COMMON} |
74 |
>=sys-apps/baselayout-2.2 |
75 |
!<sys-apps/openrc-0.11 |
76 |
!<sys-fs/cryptsetup-1.1.2 |
77 |
!!sys-fs/clvm |
78 |
!!sys-fs/lvm-user |
79 |
>=sys-apps/util-linux-2.16 |
80 |
lvm2create_initrd? ( sys-apps/makedev ) |
81 |
thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )" |
82 |
# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check |
83 |
DEPEND="${DEPEND_COMMON} |
84 |
virtual/pkgconfig |
85 |
>=sys-devel/binutils-2.20.1-r1 |
86 |
static? ( |
87 |
selinux? ( sys-libs/libselinux[static-libs] ) |
88 |
udev? ( >=virtual/libudev-208:=[static-libs] ) |
89 |
>=sys-apps/util-linux-2.16[static-libs] |
90 |
)" |
91 |
|
92 |
S=${WORKDIR}/${PN/lvm/LVM}.${PV} |
93 |
|
94 |
pkg_setup() { |
95 |
local CONFIG_CHECK="~SYSVIPC" |
96 |
|
97 |
if use udev; then |
98 |
local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n" |
99 |
if linux_config_exists; then |
100 |
local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH) |
101 |
if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then |
102 |
ewarn "It's recommended to set an empty value to the following kernel config option:" |
103 |
ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}" |
104 |
fi |
105 |
fi |
106 |
fi |
107 |
|
108 |
check_extra_config |
109 |
|
110 |
# 1. Genkernel no longer copies /sbin/lvm blindly. |
111 |
if use static; then |
112 |
elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with" |
113 |
elog "their static versions. If you need the static binaries," |
114 |
elog "you must append .static to the filename!" |
115 |
fi |
116 |
} |
117 |
|
118 |
src_prepare() { |
119 |
# Gentoo specific modification(s): |
120 |
epatch "${FILESDIR}"/${PN}-2.02.108-example.conf.in.patch |
121 |
|
122 |
sed -i \ |
123 |
-e "1iAR = $(tc-getAR)" \ |
124 |
-e "s:CC ?= @CC@:CC = $(tc-getCC):" \ |
125 |
make.tmpl.in || die #444082 |
126 |
|
127 |
sed -i -e '/FLAG/s:-O2::' configure{.in,} || die #480212 |
128 |
|
129 |
if ! use device-mapper-only; then |
130 |
sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196 |
131 |
fi |
132 |
|
133 |
sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514 |
134 |
|
135 |
# For upstream -- review and forward: |
136 |
epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch |
137 |
epatch "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch |
138 |
epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331 |
139 |
epatch "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373 |
140 |
epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed |
141 |
epatch "${FILESDIR}"/${PN}-2.02.92-dynamic-static-ldflags.patch #332905 |
142 |
epatch "${FILESDIR}"/${PN}-2.02.108-static-pkgconfig-libs.patch #370217, #439414 + blkid |
143 |
epatch "${FILESDIR}"/${PN}-2.02.106-pthread-pkgconfig.patch #492450 |
144 |
|
145 |
# Without thin-privision-tools, there is nothing to install for target install_man7: |
146 |
use thin || { sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die; } |
147 |
|
148 |
eautoreconf |
149 |
} |
150 |
|
151 |
src_configure() { |
152 |
filter-flags -flto |
153 |
local myconf |
154 |
local buildmode |
155 |
|
156 |
myconf="${myconf} $(use_enable !device-mapper-only dmeventd)" |
157 |
myconf="${myconf} $(use_enable !device-mapper-only cmdlib)" |
158 |
myconf="${myconf} $(use_enable !device-mapper-only applib)" |
159 |
myconf="${myconf} $(use_enable !device-mapper-only fsadm)" |
160 |
myconf="${myconf} $(use_enable !device-mapper-only lvmetad)" |
161 |
use device-mapper-only && myconf="${myconf} --disable-udev-systemd-background-jobs" |
162 |
|
163 |
# Most of this package does weird stuff. |
164 |
# The build options are tristate, and --without is NOT supported |
165 |
# options: 'none', 'internal', 'shared' |
166 |
if use static; then |
167 |
buildmode="internal" |
168 |
# This only causes the .static versions to become available |
169 |
myconf="${myconf} --enable-static_link" |
170 |
else |
171 |
buildmode="shared" |
172 |
fi |
173 |
dmbuildmode=$(use !device-mapper-only && echo internal || echo none) |
174 |
|
175 |
# dmeventd requires mirrors to be internal, and snapshot available |
176 |
# so we cannot disable them |
177 |
myconf="${myconf} --with-mirrors=${dmbuildmode}" |
178 |
myconf="${myconf} --with-snapshots=${dmbuildmode}" |
179 |
if use thin; then |
180 |
myconf="${myconf} --with-thin=internal --with-cache=internal" |
181 |
local texec |
182 |
for texec in check dump repair restore; do |
183 |
myconf="${myconf} --with-thin-${texec}=${EPREFIX}/sbin/thin_${texec}" |
184 |
myconf="${myconf} --with-cache-${texec}=${EPREFIX}/sbin/cache_${texec}" |
185 |
done |
186 |
else |
187 |
myconf="${myconf} --with-thin=none --with-cache=none" |
188 |
fi |
189 |
|
190 |
if use lvm1; then |
191 |
myconf="${myconf} --with-lvm1=${buildmode}" |
192 |
else |
193 |
myconf="${myconf} --with-lvm1=none" |
194 |
fi |
195 |
|
196 |
# disable O_DIRECT support on hppa, breaks pv detection (#99532) |
197 |
use hppa && myconf="${myconf} --disable-o_direct" |
198 |
|
199 |
if use clvm; then |
200 |
myconf="${myconf} --with-cluster=${buildmode}" |
201 |
# 4-state! Make sure we get it right, per bug 210879 |
202 |
# Valid options are: none, cman, gulm, all |
203 |
# |
204 |
# 2009/02: |
205 |
# gulm is removed now, now dual-state: |
206 |
# cman, none |
207 |
# all still exists, but is not needed |
208 |
# |
209 |
# 2009/07: |
210 |
# TODO: add corosync and re-enable ALL |
211 |
local clvmd="" |
212 |
use cman && clvmd="cman" |
213 |
#clvmd="${clvmd/cmangulm/all}" |
214 |
[ -z "${clvmd}" ] && clvmd="none" |
215 |
myconf="${myconf} --with-clvmd=${clvmd}" |
216 |
myconf="${myconf} --with-pool=${buildmode}" |
217 |
else |
218 |
myconf="${myconf} --with-clvmd=none --with-cluster=none" |
219 |
fi |
220 |
|
221 |
econf \ |
222 |
$(use_enable readline) \ |
223 |
$(use_enable selinux) \ |
224 |
--enable-pkgconfig \ |
225 |
--with-confdir="${EPREFIX}"/etc \ |
226 |
--exec-prefix="${EPREFIX}" \ |
227 |
--sbindir="${EPREFIX}/sbin" \ |
228 |
--with-staticdir="${EPREFIX}"/sbin \ |
229 |
--libdir="${EPREFIX}/$(get_libdir)" \ |
230 |
--with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \ |
231 |
--with-default-dm-run-dir=/run \ |
232 |
--with-default-run-dir=/run/lvm \ |
233 |
--with-default-locking-dir=/run/lock/lvm \ |
234 |
--with-default-pid-dir=/run \ |
235 |
$(use_enable udev udev_rules) \ |
236 |
$(use_enable udev udev_sync) \ |
237 |
$(use_with udev udevdir "$(get_udevdir)"/rules.d) \ |
238 |
$(use_enable systemd udev-systemd-background-jobs) \ |
239 |
"$(systemd_with_unitdir)" \ |
240 |
${myconf} \ |
241 |
CLDFLAGS="${LDFLAGS}" |
242 |
} |
243 |
|
244 |
src_compile() { |
245 |
pushd include >/dev/null |
246 |
emake |
247 |
popd >/dev/null |
248 |
|
249 |
if use device-mapper-only ; then |
250 |
emake device-mapper |
251 |
else |
252 |
emake |
253 |
emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat |
254 |
fi |
255 |
} |
256 |
|
257 |
src_install() { |
258 |
local inst |
259 |
INSTALL_TARGETS="install install_systemd_units install_systemd_generators install_tmpfiles_configuration" |
260 |
use device-mapper-only && INSTALL_TARGETS="install_device-mapper" |
261 |
for inst in ${INSTALL_TARGETS}; do |
262 |
emake DESTDIR="${D}" ${inst} |
263 |
done |
264 |
|
265 |
newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper |
266 |
newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper |
267 |
|
268 |
if use !device-mapper-only ; then |
269 |
newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd |
270 |
newinitd "${FILESDIR}"/lvm.rc-2.02.105-r2 lvm |
271 |
newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm |
272 |
|
273 |
newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring |
274 |
newinitd "${FILESDIR}"/lvmetad.initd-2.02.105-r2 lvmetad |
275 |
fi |
276 |
|
277 |
if use clvm; then |
278 |
newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd |
279 |
newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd |
280 |
fi |
281 |
|
282 |
if use static-libs; then |
283 |
dolib.a libdm/ioctl/libdevmapper.a |
284 |
dolib.a libdaemon/client/libdaemonclient.a #462908 |
285 |
#gen_usr_ldscript libdevmapper.so |
286 |
dolib.a daemons/dmeventd/libdevmapper-event.a |
287 |
#gen_usr_ldscript libdevmapper-event.so |
288 |
else |
289 |
rm -f "${ED}"usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a |
290 |
fi |
291 |
|
292 |
if use lvm2create_initrd; then |
293 |
dosbin scripts/lvm2create_initrd/lvm2create_initrd |
294 |
doman scripts/lvm2create_initrd/lvm2create_initrd.8 |
295 |
newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd |
296 |
fi |
297 |
|
298 |
insinto /etc |
299 |
doins "${FILESDIR}"/dmtab |
300 |
|
301 |
dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf |
302 |
} |
303 |
|
304 |
pkg_postinst() { |
305 |
ewarn "Make sure the \"lvm\" init script is in the runlevels:" |
306 |
ewarn "# rc-update add lvm boot" |
307 |
ewarn |
308 |
ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want" |
309 |
ewarn "to enable lvm autoactivation and metadata caching." |
310 |
} |
311 |
|
312 |
src_test() { |
313 |
einfo "Tests are disabled because of device-node mucking, if you want to" |
314 |
einfo "run tests, compile the package and see ${S}/tests" |
315 |
} |