Gentoo Archives: gentoo-commits

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