1 |
commit: b8b99da05953052a27440192953e417e07965fb6 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Mar 26 20:05:18 2020 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 26 20:24:01 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8b99da0 |
7 |
|
8 |
sys-fs/lvm2: Bump to version 2.02.187 |
9 |
|
10 |
Package-Manager: Portage-2.3.96, Repoman-2.3.22 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
sys-fs/lvm2/Manifest | 1 + |
14 |
sys-fs/lvm2/lvm2-2.02.187.ebuild | 279 +++++++++++++++++++++++++++++++++++++++ |
15 |
2 files changed, 280 insertions(+) |
16 |
|
17 |
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest |
18 |
index ffeb72c5ba1..ae797edca1e 100644 |
19 |
--- a/sys-fs/lvm2/Manifest |
20 |
+++ b/sys-fs/lvm2/Manifest |
21 |
@@ -2,4 +2,5 @@ DIST LVM2.2.02.116.tgz 1538340 BLAKE2B 718261b60626f2eca5ba13011646bf551523ed8e5 |
22 |
DIST LVM2.2.02.145.tgz 1986370 BLAKE2B 0c9e5efae17f26ff86152cecbf0b11a74e85007b2fa9491f44dec03ac8c11375bacf6685213b4be19037c8fbf70e13549516716ecf8fa262919a44625e6aab34 SHA512 84e28b3efc940837ea9da70fce620744aea0945ba29383b76ad7bcd4b5259b897c714162a8e8b7cfe26ae736a3ad2eca633a3e0df4d6280a32b28bd4cf472d27 |
23 |
DIST LVM2.2.02.184.tgz 2383698 BLAKE2B b6e308d76d541b9461dfcc6e82db256a175ccdabfae9c9d57d84eabd0d5ea50e3e09954b34741903e027412c2c26f72a5005fe934261576337a810738139deb8 SHA512 9db74f675e7c58f663a39afb79b6f33a33ad2cfbda63e9783ef5027f33977b4a1262a2e6754aa67c586eed083ee119a2e837c32a7746dcc53f13877c9d65c390 |
24 |
DIST LVM2.2.02.186.tgz 2389759 BLAKE2B e094c0135d455386ea5789208899d4dbdd5e78bebf52e49ab5587f881fbc2b94c6accecacf1b4ed182b0c87046402c00a47a1b724795a94fe3ec998b580a77ae SHA512 06a1c00142ee41d8a576a5e06a5beae70baced3020e753ce3b612355cc4d9e33be4acf58569d49436c4ee1118d288d884c7301b7d886074eaf9f2fa6b0248c03 |
25 |
+DIST LVM2.2.02.187.tgz 2405544 BLAKE2B be804be3c64927a8848e8ea8de228fb563b6f8c22628b785aabb33fc993629e5370788216bd814246aeb3a5546fd5446383ce24342e716579887556edf2bbed2 SHA512 3ce56f0c0d2e7dbcdae5be263199f73ee5c4c052599d53cde9b16500a326d0340893344f4671839be06b5b4225d592175d01c9974db14f2dc220d6e9a1d47e91 |
26 |
DIST LVM2.2.03.08.tgz 2473981 BLAKE2B 28c91caf3a6c3a6cd0693ee6b9689ce47c5ff3ef2365e6aa985a4e05ebf9c31ba20800663c6b2c2a309d220645d99c08a66111954872ad21525319996d2e3172 SHA512 411c76de2acd8d7d707b60a4aab3f846004a1fbdc7b1d3f34d21af8ed45716adc0516b11491a26261580da7396d13a506e3994b32f5d1cefdf49c97e5d62d2e3 |
27 |
|
28 |
diff --git a/sys-fs/lvm2/lvm2-2.02.187.ebuild b/sys-fs/lvm2/lvm2-2.02.187.ebuild |
29 |
new file mode 100644 |
30 |
index 00000000000..b8abffaea8a |
31 |
--- /dev/null |
32 |
+++ b/sys-fs/lvm2/lvm2-2.02.187.ebuild |
33 |
@@ -0,0 +1,279 @@ |
34 |
+# Copyright 1999-2020 Gentoo Authors |
35 |
+# Distributed under the terms of the GNU General Public License v2 |
36 |
+ |
37 |
+EAPI=7 |
38 |
+inherit autotools linux-info multilib systemd toolchain-funcs udev flag-o-matic |
39 |
+ |
40 |
+DESCRIPTION="User-land utilities for LVM2 (device-mapper) software" |
41 |
+HOMEPAGE="https://sourceware.org/lvm2/" |
42 |
+SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz |
43 |
+ ftp://sourceware.org/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz" |
44 |
+ |
45 |
+LICENSE="GPL-2" |
46 |
+SLOT="0" |
47 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" |
48 |
+IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only" |
49 |
+REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin ) |
50 |
+ systemd? ( udev )" |
51 |
+ |
52 |
+DEPEND_COMMON=" |
53 |
+ dev-libs/libaio[static-libs?] |
54 |
+ static? ( dev-libs/libaio[static-libs] ) |
55 |
+ !static? ( dev-libs/libaio[static-libs?] ) |
56 |
+ readline? ( sys-libs/readline:0= ) |
57 |
+ sanlock? ( sys-cluster/sanlock ) |
58 |
+ systemd? ( >=sys-apps/systemd-205:0= ) |
59 |
+ udev? ( >=virtual/libudev-208:=[static-libs(-)?] )" |
60 |
+# /run is now required for locking during early boot. /var cannot be assumed to |
61 |
+# be available -- thus, pull in recent enough baselayout for /run. |
62 |
+# This version of LVM is incompatible with cryptsetup <1.1.2. |
63 |
+RDEPEND="${DEPEND_COMMON} |
64 |
+ >=sys-apps/baselayout-2.2 |
65 |
+ !<sys-apps/openrc-0.11 |
66 |
+ !<sys-fs/cryptsetup-1.1.2 |
67 |
+ !!sys-fs/lvm-user |
68 |
+ >=sys-apps/util-linux-2.16 |
69 |
+ lvm2create_initrd? ( sys-apps/makedev ) |
70 |
+ thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )" |
71 |
+# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check |
72 |
+# USE 'static' currently only works with eudev, bug 520450 |
73 |
+DEPEND="${DEPEND_COMMON} |
74 |
+ >=sys-devel/binutils-2.20.1-r1 |
75 |
+ static? ( |
76 |
+ selinux? ( sys-libs/libselinux[static-libs] ) |
77 |
+ udev? ( >=sys-fs/eudev-3.1.2[static-libs] ) |
78 |
+ >=sys-apps/util-linux-2.16[static-libs] |
79 |
+ )" |
80 |
+BDEPEND=" |
81 |
+ sys-devel/autoconf-archive |
82 |
+ virtual/pkgconfig |
83 |
+" |
84 |
+ |
85 |
+S="${WORKDIR}/${PN/lvm/LVM}.${PV}" |
86 |
+ |
87 |
+PATCHES=( |
88 |
+ # Gentoo specific modification(s): |
89 |
+ "${FILESDIR}"/${PN}-2.02.178-example.conf.in.patch |
90 |
+ |
91 |
+ # For upstream -- review and forward: |
92 |
+ "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch |
93 |
+ "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch |
94 |
+ "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331 |
95 |
+ "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373 |
96 |
+ "${FILESDIR}"/${PN}-2.02.178-asneeded.patch # -Wl,--as-needed |
97 |
+ "${FILESDIR}"/${PN}-2.02.178-dynamic-static-ldflags.patch #332905 |
98 |
+ "${FILESDIR}"/${PN}-2.02.178-static-pkgconfig-libs.patch #370217, #439414 + blkid |
99 |
+ "${FILESDIR}"/${PN}-2.02.176-pthread-pkgconfig.patch #492450 |
100 |
+ "${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756 |
101 |
+ "${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446 |
102 |
+ #"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream |
103 |
+ "${FILESDIR}"/${PN}-2.02.184-dmeventd-no-idle-exit.patch |
104 |
+ #"${FILESDIR}"/${PN}-2.02.184-allow-reading-metadata-with-invalid-creation_time.patch #682380 # merged upstream |
105 |
+ "${FILESDIR}"/${PN}-2.02.184-mksh_build.patch #686652 |
106 |
+ "${FILESDIR}"/${PN}-2.02.186-udev_remove_unsupported_option.patch #700160 |
107 |
+) |
108 |
+ |
109 |
+pkg_setup() { |
110 |
+ local CONFIG_CHECK="~SYSVIPC" |
111 |
+ |
112 |
+ if use udev; then |
113 |
+ local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n" |
114 |
+ if linux_config_exists; then |
115 |
+ local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH) |
116 |
+ if [[ -n "${uevent_helper_path}" ]] && [[ "${uevent_helper_path}" != '""' ]]; then |
117 |
+ ewarn "It's recommended to set an empty value to the following kernel config option:" |
118 |
+ ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}" |
119 |
+ fi |
120 |
+ fi |
121 |
+ fi |
122 |
+ |
123 |
+ check_extra_config |
124 |
+ |
125 |
+ # 1. Genkernel no longer copies /sbin/lvm blindly. |
126 |
+ if use static; then |
127 |
+ elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with" |
128 |
+ elog "their static versions. If you need the static binaries," |
129 |
+ elog "you must append .static to the filename!" |
130 |
+ fi |
131 |
+} |
132 |
+ |
133 |
+src_prepare() { |
134 |
+ default |
135 |
+ |
136 |
+ sed -i \ |
137 |
+ -e "1iAR = $(tc-getAR)" \ |
138 |
+ -e "s:CC ?= @CC@:CC = $(tc-getCC):" \ |
139 |
+ make.tmpl.in || die #444082 |
140 |
+ |
141 |
+ sed -i -e '/FLAG/s:-O2::' configure{.ac,} || die #480212 |
142 |
+ |
143 |
+ if use udev && ! use device-mapper-only; then |
144 |
+ sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196 |
145 |
+ elog "Notice that \"use_lvmetad\" setting is enabled with USE=\"udev\" in" |
146 |
+ elog "/etc/lvm/lvm.conf, which will require restart of udev, lvm, and lvmetad" |
147 |
+ elog "if it was previously disabled." |
148 |
+ fi |
149 |
+ |
150 |
+ sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514 |
151 |
+ |
152 |
+ # Don't install thin man page when not requested |
153 |
+ if ! use thin ; then |
154 |
+ sed -i -e 's/^\(MAN7+=.*\) $(LVMTHINMAN) \(.*\)$/\1 \2/' man/Makefile.in || die |
155 |
+ fi |
156 |
+ |
157 |
+ eautoreconf |
158 |
+} |
159 |
+ |
160 |
+src_configure() { |
161 |
+ filter-flags -flto |
162 |
+ local myeconfargs=() |
163 |
+ |
164 |
+ # Most of this package does weird stuff. |
165 |
+ # The build options are tristate, and --without is NOT supported |
166 |
+ # options: 'none', 'internal', 'shared' |
167 |
+ myeconfargs+=( |
168 |
+ $(use_enable !device-mapper-only dmfilemapd) |
169 |
+ $(use_enable !device-mapper-only dmeventd) |
170 |
+ $(use_enable !device-mapper-only cmdlib) |
171 |
+ $(use_enable !device-mapper-only applib) |
172 |
+ $(use_enable !device-mapper-only fsadm) |
173 |
+ $(use_enable !device-mapper-only lvmetad) |
174 |
+ $(use_enable !device-mapper-only lvmpolld) |
175 |
+ $(usex device-mapper-only --disable-udev-systemd-background-jobs '') |
176 |
+ |
177 |
+ # This only causes the .static versions to become available |
178 |
+ $(usex static --enable-static_link '') |
179 |
+ |
180 |
+ # dmeventd requires mirrors to be internal, and snapshot available |
181 |
+ # so we cannot disable them |
182 |
+ --with-mirrors="$(usex device-mapper-only none internal)" |
183 |
+ --with-snapshots="$(usex device-mapper-only none internal)" |
184 |
+ |
185 |
+ # disable O_DIRECT support on hppa, breaks pv detection (#99532) |
186 |
+ $(usex hppa --disable-o_direct '') |
187 |
+ ) |
188 |
+ |
189 |
+ if use thin; then |
190 |
+ myeconfargs+=( --with-thin=internal --with-cache=internal ) |
191 |
+ local texec |
192 |
+ for texec in check dump repair restore; do |
193 |
+ myeconfargs+=( --with-thin-${texec}="${EPREFIX}"/sbin/thin_${texec} ) |
194 |
+ myeconfargs+=( --with-cache-${texec}="${EPREFIX}"/sbin/cache_${texec} ) |
195 |
+ done |
196 |
+ else |
197 |
+ myeconfargs+=( --with-thin=none --with-cache=none ) |
198 |
+ fi |
199 |
+ |
200 |
+ myeconfargs+=( --with-clvmd=none --with-cluster=none ) |
201 |
+ |
202 |
+ myeconfargs+=( |
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 |
+ $(use_enable sanlock lvmlockd-sanlock) |
220 |
+ $(use_enable systemd udev-systemd-background-jobs) |
221 |
+ $(use_enable systemd notify-dbus) |
222 |
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" |
223 |
+ CLDFLAGS="${LDFLAGS}" |
224 |
+ ) |
225 |
+ # Hard-wire this to bash as some shells (dash) don't know |
226 |
+ # "-o pipefail" #682404 |
227 |
+ CONFIG_SHELL="/bin/bash" \ |
228 |
+ econf "${myeconfargs[@]}" |
229 |
+} |
230 |
+ |
231 |
+src_compile() { |
232 |
+ pushd include >/dev/null |
233 |
+ emake V=1 |
234 |
+ popd >/dev/null |
235 |
+ |
236 |
+ if use device-mapper-only ; then |
237 |
+ emake V=1 device-mapper |
238 |
+ else |
239 |
+ emake V=1 |
240 |
+ emake V=1 CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat |
241 |
+ fi |
242 |
+} |
243 |
+ |
244 |
+src_install() { |
245 |
+ local inst INSTALL_TARGETS |
246 |
+ INSTALL_TARGETS=( install install_tmpfiles_configuration ) |
247 |
+ # install systemd related files only when requested, bug #522430 |
248 |
+ use systemd && INSTALL_TARGETS+=( install_systemd_units install_systemd_generators ) |
249 |
+ use device-mapper-only && INSTALL_TARGETS=( install_device-mapper ) |
250 |
+ for inst in ${INSTALL_TARGETS[@]}; do |
251 |
+ emake V=1 DESTDIR="${D}" ${inst} |
252 |
+ done |
253 |
+ |
254 |
+ newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper |
255 |
+ newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper |
256 |
+ |
257 |
+ if use !device-mapper-only ; then |
258 |
+ newinitd "${FILESDIR}"/dmeventd.initd-2.02.184-r2 dmeventd |
259 |
+ newinitd "${FILESDIR}"/lvm.rc-2.02.184-r3 lvm |
260 |
+ newconfd "${FILESDIR}"/lvm.confd-2.02.184-r3 lvm |
261 |
+ if ! use udev ; then |
262 |
+ # We keep the variable but remove udev from it. |
263 |
+ sed -r -i \ |
264 |
+ -e '/^rc_need=/s/\<udev\>//g' \ |
265 |
+ "${ED}/etc/conf.d/lvm" || die "Could not drop udev from rc_need" |
266 |
+ fi |
267 |
+ |
268 |
+ newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring |
269 |
+ newinitd "${FILESDIR}"/lvmetad.initd-2.02.116-r3 lvmetad |
270 |
+ newinitd "${FILESDIR}"/lvmpolld.initd-2.02.183 lvmpolld |
271 |
+ fi |
272 |
+ |
273 |
+ if use sanlock; then |
274 |
+ newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd |
275 |
+ fi |
276 |
+ |
277 |
+ if use static-libs; then |
278 |
+ dolib.a libdm/ioctl/libdevmapper.a |
279 |
+ if use !device-mapper-only; then |
280 |
+ # depends on lvmetad |
281 |
+ dolib.a libdaemon/client/libdaemonclient.a #462908 |
282 |
+ # depends on dmeventd |
283 |
+ dolib.a daemons/dmeventd/libdevmapper-event.a |
284 |
+ fi |
285 |
+ else |
286 |
+ rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a |
287 |
+ fi |
288 |
+ |
289 |
+ if use lvm2create_initrd; then |
290 |
+ dosbin scripts/lvm2create_initrd/lvm2create_initrd |
291 |
+ doman scripts/lvm2create_initrd/lvm2create_initrd.8 |
292 |
+ newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd |
293 |
+ fi |
294 |
+ |
295 |
+ insinto /etc |
296 |
+ doins "${FILESDIR}"/dmtab |
297 |
+ |
298 |
+ dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf |
299 |
+} |
300 |
+ |
301 |
+pkg_postinst() { |
302 |
+ ewarn "Make sure the \"lvm\" init script is in the runlevels:" |
303 |
+ ewarn "# rc-update add lvm boot" |
304 |
+ ewarn |
305 |
+ ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want" |
306 |
+ ewarn "to enable lvm autoactivation and metadata caching." |
307 |
+} |
308 |
+ |
309 |
+src_test() { |
310 |
+ einfo "Tests are disabled because of device-node mucking, if you want to" |
311 |
+ einfo "run tests, compile the package and see ${S}/tests" |
312 |
+} |