1 |
ssuominen 13/09/27 12:12:24 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: lvm2-2.02.102.ebuild |
5 |
Log: |
6 |
Version bump. |
7 |
|
8 |
(Portage version: 2.2.6/cvs/Linux x86_64, signed Manifest commit with key 4868F14D) |
9 |
|
10 |
Revision Changes Path |
11 |
1.322 sys-fs/lvm2/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/ChangeLog?rev=1.322&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/ChangeLog?rev=1.322&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/ChangeLog?r1=1.321&r2=1.322 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v |
20 |
retrieving revision 1.321 |
21 |
retrieving revision 1.322 |
22 |
diff -u -r1.321 -r1.322 |
23 |
--- ChangeLog 16 Sep 2013 14:07:36 -0000 1.321 |
24 |
+++ ChangeLog 27 Sep 2013 12:12:24 -0000 1.322 |
25 |
@@ -1,6 +1,13 @@ |
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.321 2013/09/16 14:07:36 ssuominen Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.322 2013/09/27 12:12:24 ssuominen Exp $ |
30 |
+ |
31 |
+*lvm2-2.02.102 (27 Sep 2013) |
32 |
+ |
33 |
+ 27 Sep 2013; Samuli Suominen <ssuominen@g.o> +files/lvm2-2.02.102-do-no |
34 |
+ t-install-separate-command-symlink-for-lvm-devtypes.patch, |
35 |
+ +lvm2-2.02.102.ebuild: |
36 |
+ Version bump. |
37 |
|
38 |
15 Sep 2013; Jory Pratt <anarchy@g.o> |
39 |
files/lvm2-2.02.100-selinux_and_udev_static.patch: |
40 |
|
41 |
|
42 |
|
43 |
1.1 sys-fs/lvm2/lvm2-2.02.102.ebuild |
44 |
|
45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/lvm2-2.02.102.ebuild?rev=1.1&view=markup |
46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/lvm2-2.02.102.ebuild?rev=1.1&content-type=text/plain |
47 |
|
48 |
Index: lvm2-2.02.102.ebuild |
49 |
=================================================================== |
50 |
# Copyright 1999-2013 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.102.ebuild,v 1.1 2013/09/27 12:12:24 ssuominen Exp $ |
53 |
|
54 |
EAPI=5 |
55 |
inherit autotools eutils linux-info multilib systemd toolchain-funcs udev |
56 |
|
57 |
DESCRIPTION="User-land utilities for LVM2 (device-mapper) software." |
58 |
HOMEPAGE="http://sources.redhat.com/lvm2/" |
59 |
SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz |
60 |
ftp://sources.redhat.com/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz" |
61 |
|
62 |
LICENSE="GPL-2" |
63 |
SLOT="0" |
64 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux" |
65 |
IUSE="readline static static-libs clvm cman +lvm1 lvm2create_initrd selinux +udev +thin" |
66 |
|
67 |
DEPEND_COMMON="clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) |
68 |
readline? ( sys-libs/readline ) |
69 |
udev? ( >=virtual/udev-200[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.2.1 )" |
82 |
DEPEND="${DEPEND_COMMON} |
83 |
virtual/pkgconfig |
84 |
>=sys-devel/binutils-2.20.1-r1 |
85 |
static? ( |
86 |
selinux? ( sys-libs/libselinux[static-libs] ) |
87 |
udev? ( virtual/udev[static-libs] ) |
88 |
)" |
89 |
|
90 |
S=${WORKDIR}/${PN/lvm/LVM}.${PV} |
91 |
|
92 |
pkg_setup() { |
93 |
local CONFIG_CHECK="~SYSVIPC" |
94 |
|
95 |
if use udev; then |
96 |
local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n" |
97 |
if linux_config_exists; then |
98 |
local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH) |
99 |
if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then |
100 |
ewarn "It's recommended to set an empty value to the following kernel config option:" |
101 |
ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}" |
102 |
fi |
103 |
fi |
104 |
fi |
105 |
|
106 |
check_extra_config |
107 |
|
108 |
# 1. Genkernel no longer copies /sbin/lvm blindly. |
109 |
if use static; then |
110 |
elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with" |
111 |
elog "their static versions. If you need the static binaries," |
112 |
elog "you must append .static to the filename!" |
113 |
fi |
114 |
} |
115 |
|
116 |
src_prepare() { |
117 |
# Gentoo specific modification(s): |
118 |
epatch "${FILESDIR}"/${PN}-2.02.99-example.conf.in.patch |
119 |
|
120 |
sed -i \ |
121 |
-e "1iAR = $(tc-getAR)" \ |
122 |
-e "s:CC ?= @CC@:CC = $(tc-getCC):" \ |
123 |
make.tmpl.in || die #444082 |
124 |
|
125 |
sed -i -e '/FLAG/s:-O2::' configure{,.in} || die #480212 |
126 |
|
127 |
# For upstream -- review and forward: |
128 |
epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch |
129 |
epatch "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch |
130 |
epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331 |
131 |
epatch "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373 |
132 |
epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed |
133 |
epatch "${FILESDIR}"/${PN}-2.02.92-dynamic-static-ldflags.patch #332905 |
134 |
epatch "${FILESDIR}"/${PN}-2.02.100-selinux_and_udev_static.patch #370217, #439414 |
135 |
|
136 |
# From upstream: |
137 |
epatch "${FILESDIR}"/${P}-do-not-install-separate-command-symlink-for-lvm-devtypes.patch |
138 |
|
139 |
eautoreconf |
140 |
} |
141 |
|
142 |
src_configure() { |
143 |
local myconf |
144 |
local buildmode |
145 |
|
146 |
myconf="${myconf} --enable-dmeventd" |
147 |
myconf="${myconf} --enable-cmdlib" |
148 |
myconf="${myconf} --enable-applib" |
149 |
myconf="${myconf} --enable-fsadm" |
150 |
myconf="${myconf} --enable-lvmetad" |
151 |
|
152 |
# Most of this package does weird stuff. |
153 |
# The build options are tristate, and --without is NOT supported |
154 |
# options: 'none', 'internal', 'shared' |
155 |
if use static; then |
156 |
buildmode="internal" |
157 |
# This only causes the .static versions to become available |
158 |
myconf="${myconf} --enable-static_link" |
159 |
else |
160 |
buildmode="shared" |
161 |
fi |
162 |
|
163 |
# dmeventd requires mirrors to be internal, and snapshot available |
164 |
# so we cannot disable them |
165 |
myconf="${myconf} --with-mirrors=internal" |
166 |
myconf="${myconf} --with-snapshots=internal" |
167 |
use thin \ |
168 |
&& myconf="${myconf} --with-thin=internal" \ |
169 |
|| myconf="${myconf} --with-thin=none" |
170 |
|
171 |
if use lvm1; then |
172 |
myconf="${myconf} --with-lvm1=${buildmode}" |
173 |
else |
174 |
myconf="${myconf} --with-lvm1=none" |
175 |
fi |
176 |
|
177 |
# disable O_DIRECT support on hppa, breaks pv detection (#99532) |
178 |
use hppa && myconf="${myconf} --disable-o_direct" |
179 |
|
180 |
if use clvm; then |
181 |
myconf="${myconf} --with-cluster=${buildmode}" |
182 |
# 4-state! Make sure we get it right, per bug 210879 |
183 |
# Valid options are: none, cman, gulm, all |
184 |
# |
185 |
# 2009/02: |
186 |
# gulm is removed now, now dual-state: |
187 |
# cman, none |
188 |
# all still exists, but is not needed |
189 |
# |
190 |
# 2009/07: |
191 |
# TODO: add corosync and re-enable ALL |
192 |
local clvmd="" |
193 |
use cman && clvmd="cman" |
194 |
#clvmd="${clvmd/cmangulm/all}" |
195 |
[ -z "${clvmd}" ] && clvmd="none" |
196 |
myconf="${myconf} --with-clvmd=${clvmd}" |
197 |
myconf="${myconf} --with-pool=${buildmode}" |
198 |
else |
199 |
myconf="${myconf} --with-clvmd=none --with-cluster=none" |
200 |
fi |
201 |
|
202 |
econf \ |
203 |
$(use_enable readline) \ |
204 |
$(use_enable selinux) \ |
205 |
--enable-pkgconfig \ |
206 |
--with-confdir="${EPREFIX}"/etc \ |
207 |
--exec-prefix="${EPREFIX}" \ |
208 |
--sbindir="${EPREFIX}/sbin" \ |
209 |
--with-staticdir="${EPREFIX}"/sbin \ |
210 |
--libdir="${EPREFIX}/$(get_libdir)" \ |
211 |
--with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \ |
212 |
--with-default-dm-run-dir=/run \ |
213 |
--with-default-run-dir=/run/lvm \ |
214 |
--with-default-locking-dir=/run/lock/lvm \ |
215 |
--with-default-pid-dir=/run \ |
216 |
$(use_enable udev udev_rules) \ |
217 |
$(use_enable udev udev_sync) \ |
218 |
$(use_with udev udevdir "$(get_udevdir)"/rules.d) \ |
219 |
"$(systemd_with_unitdir)" \ |
220 |
${myconf} \ |
221 |
CLDFLAGS="${LDFLAGS}" |
222 |
} |
223 |
|
224 |
src_compile() { |
225 |
pushd include >/dev/null |
226 |
emake |
227 |
popd >/dev/null |
228 |
|
229 |
emake |
230 |
emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat |
231 |
} |
232 |
|
233 |
src_install() { |
234 |
local inst |
235 |
for inst in install install_systemd_units install_systemd_generators install_tmpfiles_configuration; do |
236 |
emake DESTDIR="${D}" ${inst} |
237 |
done |
238 |
|
239 |
newinitd "${FILESDIR}"/lvm.rc-2.02.95-r2 lvm |
240 |
newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm |
241 |
|
242 |
newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.67-r2 lvm-monitoring |
243 |
|
244 |
newinitd "${FILESDIR}"/device-mapper.rc-2.02.95-r2 device-mapper |
245 |
newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper |
246 |
|
247 |
newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd |
248 |
|
249 |
if use clvm; then |
250 |
newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd |
251 |
newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd |
252 |
fi |
253 |
|
254 |
if use static-libs; then |
255 |
dolib.a libdm/ioctl/libdevmapper.a |
256 |
dolib.a libdaemon/client/libdaemonclient.a #462908 |
257 |
#gen_usr_ldscript libdevmapper.so |
258 |
dolib.a daemons/dmeventd/libdevmapper-event.a |
259 |
#gen_usr_ldscript libdevmapper-event.so |
260 |
else |
261 |
rm -f "${ED}"usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a |
262 |
fi |
263 |
|
264 |
if use lvm2create_initrd; then |
265 |
dosbin scripts/lvm2create_initrd/lvm2create_initrd |
266 |
doman scripts/lvm2create_initrd/lvm2create_initrd.8 |
267 |
newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd |
268 |
fi |
269 |
|
270 |
insinto /etc |
271 |
doins "${FILESDIR}"/dmtab |
272 |
|
273 |
dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf |
274 |
} |
275 |
|
276 |
pkg_postinst() { |
277 |
ewarn "Make sure the \"lvm\" init script is in the runlevels:" |
278 |
ewarn "# rc-update add lvm boot" |
279 |
ewarn |
280 |
ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want" |
281 |
ewarn "to enable lvm autoactivation and metadata caching." |
282 |
} |
283 |
|
284 |
src_test() { |
285 |
einfo "Tests are disabled because of device-node mucking, if you want to" |
286 |
einfo "run tests, compile the package and see ${S}/tests" |
287 |
} |