1 |
commit: e4af27e1dbcace155f5d0109b28aac4a9600da44 |
2 |
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Apr 25 04:36:20 2020 +0000 |
4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Apr 25 04:36:45 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=e4af27e1 |
7 |
|
8 |
sys-fs/lvm2: bump to latest stable |
9 |
|
10 |
Package-Manager: Portage-2.3.89, Repoman-2.3.20 |
11 |
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> |
12 |
|
13 |
sys-fs/lvm2/Manifest | 18 +- |
14 |
sys-fs/lvm2/lvm2-2.02.183.ebuild | 263 -------------------- |
15 |
sys-fs/lvm2/lvm2-2.02.184-r1.ebuild | 266 -------------------- |
16 |
sys-fs/lvm2/lvm2-2.02.184-r4.ebuild | 274 -------------------- |
17 |
sys-fs/lvm2/lvm2-2.02.184-r5.ebuild | 276 --------------------- |
18 |
sys-fs/lvm2/lvm2-2.02.184.ebuild | 262 ------------------- |
19 |
...-2.02.186-r2.ebuild => lvm2-2.02.187-r2.ebuild} | 6 +- |
20 |
7 files changed, 4 insertions(+), 1361 deletions(-) |
21 |
|
22 |
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest |
23 |
index b7043ca..a94c173 100644 |
24 |
--- a/sys-fs/lvm2/Manifest |
25 |
+++ b/sys-fs/lvm2/Manifest |
26 |
@@ -1,17 +1 @@ |
27 |
------BEGIN PGP SIGNED MESSAGE----- |
28 |
-Hash: SHA256 |
29 |
- |
30 |
-DIST LVM2.2.02.183.tgz 2380574 BLAKE2B b1fe71b6cdb8ee20dd53d0ad3399c553487baafa12657ec81a794c84ad161988afdb8693ac247877a2645d693a0740c74c8b991047ed2ba4adc9ec75f1c261a9 SHA512 3947523c6b0862ada40677ed171ed0cf95e070119e377296fc5ccb153e9c4212d34c0b16a887dbd68ccf265525345dabfed2aa59fb3604555429a7e2ecfff4d7 |
31 |
-DIST LVM2.2.02.184.tgz 2383698 BLAKE2B b6e308d76d541b9461dfcc6e82db256a175ccdabfae9c9d57d84eabd0d5ea50e3e09954b34741903e027412c2c26f72a5005fe934261576337a810738139deb8 SHA512 9db74f675e7c58f663a39afb79b6f33a33ad2cfbda63e9783ef5027f33977b4a1262a2e6754aa67c586eed083ee119a2e837c32a7746dcc53f13877c9d65c390 |
32 |
-DIST LVM2.2.02.186.tgz 2389759 BLAKE2B e094c0135d455386ea5789208899d4dbdd5e78bebf52e49ab5587f881fbc2b94c6accecacf1b4ed182b0c87046402c00a47a1b724795a94fe3ec998b580a77ae SHA512 06a1c00142ee41d8a576a5e06a5beae70baced3020e753ce3b612355cc4d9e33be4acf58569d49436c4ee1118d288d884c7301b7d886074eaf9f2fa6b0248c03 |
33 |
------BEGIN PGP SIGNATURE----- |
34 |
- |
35 |
-iQEzBAEBCAAdFiEEDe3xqQRWi60fxFwoPcxEeC7QfhwFAl3vqfcACgkQPcxEeC7Q |
36 |
-fhwSxwf/fiCH3bVA5161TlVLqLnt1U9L5kJBHnUzha2oB5Pl6zYC6FhYLQwbBBPP |
37 |
-JFaquKMyd52GSwW5Bh+FoJPb5NUlYeVG5MGz2xSLzmv9crEajF+uBtbx4RbCy8l1 |
38 |
-bwu5Kvm0kl/wY16bjj32Nb1JC/NYJL48Hlp1ctHiWXwAIhMTIWyHmde1WwXncwRM |
39 |
-xGoXAO2t3XQR3OWuJlvUfq2SJHIbd4IF4wlM6R4805Hks/kLePqCQ4gVp/PS5FMK |
40 |
-PwcCuf5uC0Iad7nlxQAZzhKLKk819Sf9bAOEruRQmGddnZcb/sJFwOsttv4ykJxu |
41 |
-a+mjZGkExGsjf2Zktse+9pl4EvE1qA== |
42 |
-=ODib |
43 |
------END PGP SIGNATURE----- |
44 |
+DIST LVM2.2.02.187.tgz 2405544 BLAKE2B be804be3c64927a8848e8ea8de228fb563b6f8c22628b785aabb33fc993629e5370788216bd814246aeb3a5546fd5446383ce24342e716579887556edf2bbed2 SHA512 3ce56f0c0d2e7dbcdae5be263199f73ee5c4c052599d53cde9b16500a326d0340893344f4671839be06b5b4225d592175d01c9974db14f2dc220d6e9a1d47e91 |
45 |
|
46 |
diff --git a/sys-fs/lvm2/lvm2-2.02.183.ebuild b/sys-fs/lvm2/lvm2-2.02.183.ebuild |
47 |
deleted file mode 100644 |
48 |
index 96ca623..0000000 |
49 |
--- a/sys-fs/lvm2/lvm2-2.02.183.ebuild |
50 |
+++ /dev/null |
51 |
@@ -1,263 +0,0 @@ |
52 |
-# Copyright 1999-2019 Gentoo Authors |
53 |
-# Distributed under the terms of the GNU General Public License v2 |
54 |
- |
55 |
-EAPI=6 |
56 |
-inherit autotools linux-info multilib systemd toolchain-funcs udev flag-o-matic usr-ldscript |
57 |
- |
58 |
-DESCRIPTION="User-land utilities for LVM2 (device-mapper) software" |
59 |
-HOMEPAGE="https://sourceware.org/lvm2/" |
60 |
-SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz |
61 |
- ftp://sourceware.org/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz" |
62 |
- |
63 |
-LICENSE="GPL-2" |
64 |
-SLOT="0" |
65 |
-KEYWORDS="amd64 ~arm arm64 ~mips ppc x86" |
66 |
-IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only" |
67 |
-REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin ) |
68 |
- systemd? ( udev )" |
69 |
- |
70 |
-DEPEND_COMMON=" |
71 |
- dev-libs/libaio[static-libs?] |
72 |
- static? ( dev-libs/libaio[static-libs] ) |
73 |
- !static? ( dev-libs/libaio[static-libs?] ) |
74 |
- readline? ( sys-libs/readline:0= ) |
75 |
- sanlock? ( sys-cluster/sanlock ) |
76 |
- systemd? ( >=sys-apps/systemd-205:0= ) |
77 |
- udev? ( >=virtual/libudev-208:=[static-libs?] )" |
78 |
-# /run is now required for locking during early boot. /var cannot be assumed to |
79 |
-# be available -- thus, pull in recent enough baselayout for /run. |
80 |
-# This version of LVM is incompatible with cryptsetup <1.1.2. |
81 |
-RDEPEND="${DEPEND_COMMON} |
82 |
- >=sys-apps/baselayout-2.2 |
83 |
- !<sys-apps/openrc-0.11 |
84 |
- !<sys-fs/cryptsetup-1.1.2 |
85 |
- !!sys-fs/lvm-user |
86 |
- >=sys-apps/util-linux-2.16 |
87 |
- lvm2create_initrd? ( sys-apps/makedev ) |
88 |
- thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )" |
89 |
-# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check |
90 |
-# USE 'static' currently only works with eudev, bug 520450 |
91 |
-DEPEND="${DEPEND_COMMON} |
92 |
- virtual/pkgconfig |
93 |
- >=sys-devel/binutils-2.20.1-r1 |
94 |
- sys-devel/autoconf-archive |
95 |
- static? ( |
96 |
- selinux? ( sys-libs/libselinux[static-libs] ) |
97 |
- udev? ( >=sys-fs/eudev-3.1.2[static-libs] ) |
98 |
- >=sys-apps/util-linux-2.16[static-libs] |
99 |
- )" |
100 |
- |
101 |
-S=${WORKDIR}/${PN/lvm/LVM}.${PV} |
102 |
- |
103 |
-PATCHES=( |
104 |
- # Gentoo specific modification(s): |
105 |
- "${FILESDIR}"/${PN}-2.02.178-example.conf.in.patch |
106 |
- |
107 |
- # Musl fixes |
108 |
- "${FILESDIR}"/${PN}-2.02.183-fix-stdio-usage.patch |
109 |
- "${FILESDIR}"/${PN}-2.02.183-portability.patch |
110 |
- "${FILESDIR}"/${PN}-2.02.183-implement-libc-specific-reopen_stream.patch |
111 |
- |
112 |
- # For upstream -- review and forward: |
113 |
- "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch |
114 |
- "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch |
115 |
- "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331 |
116 |
- "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373 |
117 |
- "${FILESDIR}"/${PN}-2.02.178-asneeded.patch # -Wl,--as-needed |
118 |
- "${FILESDIR}"/${PN}-2.02.178-dynamic-static-ldflags.patch #332905 |
119 |
- "${FILESDIR}"/${PN}-2.02.178-static-pkgconfig-libs.patch #370217, #439414 + blkid |
120 |
- "${FILESDIR}"/${PN}-2.02.176-pthread-pkgconfig.patch #492450 |
121 |
- "${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756 |
122 |
- "${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446 |
123 |
- #"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream |
124 |
-) |
125 |
- |
126 |
-pkg_setup() { |
127 |
- local CONFIG_CHECK="~SYSVIPC" |
128 |
- |
129 |
- if use udev; then |
130 |
- local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n" |
131 |
- if linux_config_exists; then |
132 |
- local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH) |
133 |
- if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then |
134 |
- ewarn "It's recommended to set an empty value to the following kernel config option:" |
135 |
- ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}" |
136 |
- fi |
137 |
- fi |
138 |
- fi |
139 |
- |
140 |
- check_extra_config |
141 |
- |
142 |
- # 1. Genkernel no longer copies /sbin/lvm blindly. |
143 |
- if use static; then |
144 |
- elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with" |
145 |
- elog "their static versions. If you need the static binaries," |
146 |
- elog "you must append .static to the filename!" |
147 |
- fi |
148 |
-} |
149 |
- |
150 |
-src_prepare() { |
151 |
- default |
152 |
- |
153 |
- sed -i \ |
154 |
- -e "1iAR = $(tc-getAR)" \ |
155 |
- -e "s:CC ?= @CC@:CC = $(tc-getCC):" \ |
156 |
- make.tmpl.in || die #444082 |
157 |
- |
158 |
- sed -i -e '/FLAG/s:-O2::' configure{.ac,} || die #480212 |
159 |
- |
160 |
- if use udev && ! use device-mapper-only; then |
161 |
- sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196 |
162 |
- elog "Notice that \"use_lvmetad\" setting is enabled with USE=\"udev\" in" |
163 |
- elog "/etc/lvm/lvm.conf, which will require restart of udev, lvm, and lvmetad" |
164 |
- elog "if it was previously disabled." |
165 |
- fi |
166 |
- |
167 |
- sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514 |
168 |
- |
169 |
- # Without thin-privision-tools, there is nothing to install for target install_man7: |
170 |
- if ! use thin ; then |
171 |
- sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die |
172 |
- fi |
173 |
- |
174 |
- eautoreconf |
175 |
-} |
176 |
- |
177 |
-src_configure() { |
178 |
- filter-flags -flto |
179 |
- local myeconfargs=() |
180 |
- |
181 |
- # Most of this package does weird stuff. |
182 |
- # The build options are tristate, and --without is NOT supported |
183 |
- # options: 'none', 'internal', 'shared' |
184 |
- myeconfargs+=( |
185 |
- $(use_enable !device-mapper-only dmeventd) |
186 |
- $(use_enable !device-mapper-only cmdlib) |
187 |
- $(use_enable !device-mapper-only applib) |
188 |
- $(use_enable !device-mapper-only fsadm) |
189 |
- $(use_enable !device-mapper-only lvmetad) |
190 |
- $(usex device-mapper-only --disable-udev-systemd-background-jobs '') |
191 |
- |
192 |
- # This only causes the .static versions to become available |
193 |
- $(usex static --enable-static_link '') |
194 |
- |
195 |
- # dmeventd requires mirrors to be internal, and snapshot available |
196 |
- # so we cannot disable them |
197 |
- --with-mirrors="$(usex device-mapper-only none internal)" |
198 |
- --with-snapshots="$(usex device-mapper-only none internal)" |
199 |
- |
200 |
- # disable O_DIRECT support on hppa, breaks pv detection (#99532) |
201 |
- $(usex hppa --disable-o_direct '') |
202 |
- ) |
203 |
- |
204 |
- if use thin; then |
205 |
- myeconfargs+=( --with-thin=internal --with-cache=internal ) |
206 |
- local texec |
207 |
- for texec in check dump repair restore; do |
208 |
- myeconfargs+=( --with-thin-${texec}="${EPREFIX}"/sbin/thin_${texec} ) |
209 |
- myeconfargs+=( --with-cache-${texec}="${EPREFIX}"/sbin/cache_${texec} ) |
210 |
- done |
211 |
- else |
212 |
- myeconfargs+=( --with-thin=none --with-cache=none ) |
213 |
- fi |
214 |
- |
215 |
- myeconfargs+=( --with-clvmd=none --with-cluster=none ) |
216 |
- |
217 |
- myeconfargs+=( |
218 |
- $(use_enable readline) |
219 |
- $(use_enable selinux) |
220 |
- --enable-pkgconfig |
221 |
- --with-confdir="${EPREFIX}"/etc |
222 |
- --exec-prefix="${EPREFIX}" |
223 |
- --sbindir="${EPREFIX}/sbin" |
224 |
- --with-staticdir="${EPREFIX}"/sbin |
225 |
- --libdir="${EPREFIX}/$(get_libdir)" |
226 |
- --with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" |
227 |
- --with-default-dm-run-dir=/run |
228 |
- --with-default-run-dir=/run/lvm |
229 |
- --with-default-locking-dir=/run/lock/lvm |
230 |
- --with-default-pid-dir=/run |
231 |
- $(use_enable udev udev_rules) |
232 |
- $(use_enable udev udev_sync) |
233 |
- $(use_with udev udevdir "$(get_udevdir)"/rules.d) |
234 |
- $(use_enable sanlock lvmlockd-sanlock) |
235 |
- $(use_enable systemd udev-systemd-background-jobs) |
236 |
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" |
237 |
- CLDFLAGS="${LDFLAGS}" |
238 |
- ) |
239 |
- econf "${myeconfargs[@]}" |
240 |
-} |
241 |
- |
242 |
-src_compile() { |
243 |
- pushd include >/dev/null |
244 |
- emake |
245 |
- popd >/dev/null |
246 |
- |
247 |
- if use device-mapper-only ; then |
248 |
- emake device-mapper |
249 |
- else |
250 |
- emake |
251 |
- emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat |
252 |
- fi |
253 |
-} |
254 |
- |
255 |
-src_install() { |
256 |
- local inst INSTALL_TARGETS |
257 |
- INSTALL_TARGETS=( install install_tmpfiles_configuration ) |
258 |
- # install systemd related files only when requested, bug #522430 |
259 |
- use systemd && INSTALL_TARGETS+=( install_systemd_units install_systemd_generators ) |
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.172 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.116-r3 lvmetad |
275 |
- fi |
276 |
- |
277 |
- if use sanlock; then |
278 |
- newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd |
279 |
- fi |
280 |
- |
281 |
- if use static-libs; then |
282 |
- dolib.a libdm/ioctl/libdevmapper.a |
283 |
- dolib.a libdaemon/client/libdaemonclient.a #462908 |
284 |
- #gen_usr_ldscript libdevmapper.so |
285 |
- dolib.a daemons/dmeventd/libdevmapper-event.a |
286 |
- #gen_usr_ldscript libdevmapper-event.so |
287 |
- else |
288 |
- rm -f "${ED%/}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a |
289 |
- fi |
290 |
- |
291 |
- if use lvm2create_initrd; then |
292 |
- dosbin scripts/lvm2create_initrd/lvm2create_initrd |
293 |
- doman scripts/lvm2create_initrd/lvm2create_initrd.8 |
294 |
- newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd |
295 |
- fi |
296 |
- |
297 |
- insinto /etc |
298 |
- doins "${FILESDIR}"/dmtab |
299 |
- |
300 |
- dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf |
301 |
-} |
302 |
- |
303 |
-pkg_postinst() { |
304 |
- ewarn "Make sure the \"lvm\" init script is in the runlevels:" |
305 |
- ewarn "# rc-update add lvm boot" |
306 |
- ewarn |
307 |
- ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want" |
308 |
- ewarn "to enable lvm autoactivation and metadata caching." |
309 |
-} |
310 |
- |
311 |
-src_test() { |
312 |
- einfo "Tests are disabled because of device-node mucking, if you want to" |
313 |
- einfo "run tests, compile the package and see ${S}/tests" |
314 |
-} |
315 |
|
316 |
diff --git a/sys-fs/lvm2/lvm2-2.02.184-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.184-r1.ebuild |
317 |
deleted file mode 100644 |
318 |
index 4bb75ce..0000000 |
319 |
--- a/sys-fs/lvm2/lvm2-2.02.184-r1.ebuild |
320 |
+++ /dev/null |
321 |
@@ -1,266 +0,0 @@ |
322 |
-# Copyright 1999-2019 Gentoo Authors |
323 |
-# Distributed under the terms of the GNU General Public License v2 |
324 |
- |
325 |
-EAPI=6 |
326 |
-inherit autotools linux-info multilib systemd toolchain-funcs udev flag-o-matic usr-ldscript |
327 |
- |
328 |
-DESCRIPTION="User-land utilities for LVM2 (device-mapper) software" |
329 |
-HOMEPAGE="https://sourceware.org/lvm2/" |
330 |
-SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz |
331 |
- ftp://sourceware.org/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz" |
332 |
- |
333 |
-LICENSE="GPL-2" |
334 |
-SLOT="0" |
335 |
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86" |
336 |
-IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only" |
337 |
-REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin ) |
338 |
- systemd? ( udev )" |
339 |
- |
340 |
-DEPEND_COMMON=" |
341 |
- dev-libs/libaio[static-libs?] |
342 |
- static? ( dev-libs/libaio[static-libs] ) |
343 |
- !static? ( dev-libs/libaio[static-libs?] ) |
344 |
- readline? ( sys-libs/readline:0= ) |
345 |
- sanlock? ( sys-cluster/sanlock ) |
346 |
- systemd? ( >=sys-apps/systemd-205:0= ) |
347 |
- udev? ( >=virtual/libudev-208:=[static-libs?] )" |
348 |
-# /run is now required for locking during early boot. /var cannot be assumed to |
349 |
-# be available -- thus, pull in recent enough baselayout for /run. |
350 |
-# This version of LVM is incompatible with cryptsetup <1.1.2. |
351 |
-RDEPEND="${DEPEND_COMMON} |
352 |
- >=sys-apps/baselayout-2.2 |
353 |
- !<sys-apps/openrc-0.11 |
354 |
- !<sys-fs/cryptsetup-1.1.2 |
355 |
- !!sys-fs/lvm-user |
356 |
- >=sys-apps/util-linux-2.16 |
357 |
- lvm2create_initrd? ( sys-apps/makedev ) |
358 |
- thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )" |
359 |
-# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check |
360 |
-# USE 'static' currently only works with eudev, bug 520450 |
361 |
-DEPEND="${DEPEND_COMMON} |
362 |
- virtual/pkgconfig |
363 |
- >=sys-devel/binutils-2.20.1-r1 |
364 |
- sys-devel/autoconf-archive |
365 |
- static? ( |
366 |
- selinux? ( sys-libs/libselinux[static-libs] ) |
367 |
- udev? ( >=sys-fs/eudev-3.1.2[static-libs] ) |
368 |
- >=sys-apps/util-linux-2.16[static-libs] |
369 |
- )" |
370 |
- |
371 |
-S=${WORKDIR}/${PN/lvm/LVM}.${PV} |
372 |
- |
373 |
-PATCHES=( |
374 |
- # Gentoo specific modification(s): |
375 |
- "${FILESDIR}"/${PN}-2.02.178-example.conf.in.patch |
376 |
- |
377 |
- # Musl fixes |
378 |
- "${FILESDIR}"/${PN}-2.02.183-fix-stdio-usage.patch |
379 |
- "${FILESDIR}"/${PN}-2.02.183-portability.patch |
380 |
- |
381 |
- # For upstream -- review and forward: |
382 |
- "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch |
383 |
- "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch |
384 |
- "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331 |
385 |
- "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373 |
386 |
- "${FILESDIR}"/${PN}-2.02.178-asneeded.patch # -Wl,--as-needed |
387 |
- "${FILESDIR}"/${PN}-2.02.178-dynamic-static-ldflags.patch #332905 |
388 |
- "${FILESDIR}"/${PN}-2.02.178-static-pkgconfig-libs.patch #370217, #439414 + blkid |
389 |
- "${FILESDIR}"/${PN}-2.02.176-pthread-pkgconfig.patch #492450 |
390 |
- "${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756 |
391 |
- "${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446 |
392 |
- #"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream |
393 |
-) |
394 |
- |
395 |
-pkg_setup() { |
396 |
- local CONFIG_CHECK="~SYSVIPC" |
397 |
- |
398 |
- if use udev; then |
399 |
- local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n" |
400 |
- if linux_config_exists; then |
401 |
- local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH) |
402 |
- if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then |
403 |
- ewarn "It's recommended to set an empty value to the following kernel config option:" |
404 |
- ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}" |
405 |
- fi |
406 |
- fi |
407 |
- fi |
408 |
- |
409 |
- check_extra_config |
410 |
- |
411 |
- # 1. Genkernel no longer copies /sbin/lvm blindly. |
412 |
- if use static; then |
413 |
- elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with" |
414 |
- elog "their static versions. If you need the static binaries," |
415 |
- elog "you must append .static to the filename!" |
416 |
- fi |
417 |
-} |
418 |
- |
419 |
-src_prepare() { |
420 |
- default |
421 |
- |
422 |
- sed -i \ |
423 |
- -e "1iAR = $(tc-getAR)" \ |
424 |
- -e "s:CC ?= @CC@:CC = $(tc-getCC):" \ |
425 |
- make.tmpl.in || die #444082 |
426 |
- |
427 |
- sed -i -e '/FLAG/s:-O2::' configure{.ac,} || die #480212 |
428 |
- |
429 |
- if use udev && ! use device-mapper-only; then |
430 |
- sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196 |
431 |
- elog "Notice that \"use_lvmetad\" setting is enabled with USE=\"udev\" in" |
432 |
- elog "/etc/lvm/lvm.conf, which will require restart of udev, lvm, and lvmetad" |
433 |
- elog "if it was previously disabled." |
434 |
- fi |
435 |
- |
436 |
- sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514 |
437 |
- |
438 |
- # Without thin-privision-tools, there is nothing to install for target install_man7: |
439 |
- if ! use thin ; then |
440 |
- sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die |
441 |
- fi |
442 |
- |
443 |
- eautoreconf |
444 |
-} |
445 |
- |
446 |
-src_configure() { |
447 |
- filter-flags -flto |
448 |
- local myeconfargs=() |
449 |
- |
450 |
- # Most of this package does weird stuff. |
451 |
- # The build options are tristate, and --without is NOT supported |
452 |
- # options: 'none', 'internal', 'shared' |
453 |
- myeconfargs+=( |
454 |
- $(use_enable !device-mapper-only dmfilemapd) |
455 |
- $(use_enable !device-mapper-only dmeventd) |
456 |
- $(use_enable !device-mapper-only cmdlib) |
457 |
- $(use_enable !device-mapper-only applib) |
458 |
- $(use_enable !device-mapper-only fsadm) |
459 |
- $(use_enable !device-mapper-only lvmetad) |
460 |
- $(use_enable !device-mapper-only lvmpolld) |
461 |
- $(usex device-mapper-only --disable-udev-systemd-background-jobs '') |
462 |
- |
463 |
- # This only causes the .static versions to become available |
464 |
- $(usex static --enable-static_link '') |
465 |
- |
466 |
- # dmeventd requires mirrors to be internal, and snapshot available |
467 |
- # so we cannot disable them |
468 |
- --with-mirrors="$(usex device-mapper-only none internal)" |
469 |
- --with-snapshots="$(usex device-mapper-only none internal)" |
470 |
- |
471 |
- # disable O_DIRECT support on hppa, breaks pv detection (#99532) |
472 |
- $(usex hppa --disable-o_direct '') |
473 |
- ) |
474 |
- |
475 |
- if use thin; then |
476 |
- myeconfargs+=( --with-thin=internal --with-cache=internal ) |
477 |
- local texec |
478 |
- for texec in check dump repair restore; do |
479 |
- myeconfargs+=( --with-thin-${texec}="${EPREFIX}"/sbin/thin_${texec} ) |
480 |
- myeconfargs+=( --with-cache-${texec}="${EPREFIX}"/sbin/cache_${texec} ) |
481 |
- done |
482 |
- else |
483 |
- myeconfargs+=( --with-thin=none --with-cache=none ) |
484 |
- fi |
485 |
- |
486 |
- myeconfargs+=( --with-clvmd=none --with-cluster=none ) |
487 |
- |
488 |
- myeconfargs+=( |
489 |
- $(use_enable readline) |
490 |
- $(use_enable selinux) |
491 |
- --enable-pkgconfig |
492 |
- --with-confdir="${EPREFIX}"/etc |
493 |
- --exec-prefix="${EPREFIX}" |
494 |
- --sbindir="${EPREFIX}/sbin" |
495 |
- --with-staticdir="${EPREFIX}"/sbin |
496 |
- --libdir="${EPREFIX}/$(get_libdir)" |
497 |
- --with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" |
498 |
- --with-default-dm-run-dir=/run |
499 |
- --with-default-run-dir=/run/lvm |
500 |
- --with-default-locking-dir=/run/lock/lvm |
501 |
- --with-default-pid-dir=/run |
502 |
- $(use_enable udev udev_rules) |
503 |
- $(use_enable udev udev_sync) |
504 |
- $(use_with udev udevdir "$(get_udevdir)"/rules.d) |
505 |
- $(use_enable sanlock lvmlockd-sanlock) |
506 |
- $(use_enable systemd udev-systemd-background-jobs) |
507 |
- $(use_enable systemd notify-dbus) |
508 |
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" |
509 |
- CLDFLAGS="${LDFLAGS}" |
510 |
- ) |
511 |
- econf "${myeconfargs[@]}" |
512 |
-} |
513 |
- |
514 |
-src_compile() { |
515 |
- pushd include >/dev/null |
516 |
- emake |
517 |
- popd >/dev/null |
518 |
- |
519 |
- if use device-mapper-only ; then |
520 |
- emake device-mapper |
521 |
- else |
522 |
- emake |
523 |
- emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat |
524 |
- fi |
525 |
-} |
526 |
- |
527 |
-src_install() { |
528 |
- local inst INSTALL_TARGETS |
529 |
- INSTALL_TARGETS=( install install_tmpfiles_configuration ) |
530 |
- # install systemd related files only when requested, bug #522430 |
531 |
- use systemd && INSTALL_TARGETS+=( install_systemd_units install_systemd_generators ) |
532 |
- use device-mapper-only && INSTALL_TARGETS=( install_device-mapper ) |
533 |
- for inst in ${INSTALL_TARGETS[@]}; do |
534 |
- emake DESTDIR="${D}" ${inst} |
535 |
- done |
536 |
- |
537 |
- newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper |
538 |
- newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper |
539 |
- |
540 |
- if use !device-mapper-only ; then |
541 |
- newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd |
542 |
- newinitd "${FILESDIR}"/lvm.rc-2.02.172 lvm |
543 |
- newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm |
544 |
- |
545 |
- newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring |
546 |
- newinitd "${FILESDIR}"/lvmetad.initd-2.02.116-r3 lvmetad |
547 |
- newinitd "${FILESDIR}"/lvmpolld.initd-2.02.183 lvmpolld |
548 |
- fi |
549 |
- |
550 |
- if use sanlock; then |
551 |
- newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd |
552 |
- fi |
553 |
- |
554 |
- if use static-libs; then |
555 |
- dolib.a libdm/ioctl/libdevmapper.a |
556 |
- dolib.a libdaemon/client/libdaemonclient.a #462908 |
557 |
- #gen_usr_ldscript libdevmapper.so |
558 |
- dolib.a daemons/dmeventd/libdevmapper-event.a |
559 |
- #gen_usr_ldscript libdevmapper-event.so |
560 |
- else |
561 |
- rm -f "${ED%/}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a |
562 |
- fi |
563 |
- |
564 |
- if use lvm2create_initrd; then |
565 |
- dosbin scripts/lvm2create_initrd/lvm2create_initrd |
566 |
- doman scripts/lvm2create_initrd/lvm2create_initrd.8 |
567 |
- newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd |
568 |
- fi |
569 |
- |
570 |
- insinto /etc |
571 |
- doins "${FILESDIR}"/dmtab |
572 |
- |
573 |
- dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf |
574 |
-} |
575 |
- |
576 |
-pkg_postinst() { |
577 |
- ewarn "Make sure the \"lvm\" init script is in the runlevels:" |
578 |
- ewarn "# rc-update add lvm boot" |
579 |
- ewarn |
580 |
- ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want" |
581 |
- ewarn "to enable lvm autoactivation and metadata caching." |
582 |
-} |
583 |
- |
584 |
-src_test() { |
585 |
- einfo "Tests are disabled because of device-node mucking, if you want to" |
586 |
- einfo "run tests, compile the package and see ${S}/tests" |
587 |
-} |
588 |
|
589 |
diff --git a/sys-fs/lvm2/lvm2-2.02.184-r4.ebuild b/sys-fs/lvm2/lvm2-2.02.184-r4.ebuild |
590 |
deleted file mode 100644 |
591 |
index 0b11a28..0000000 |
592 |
--- a/sys-fs/lvm2/lvm2-2.02.184-r4.ebuild |
593 |
+++ /dev/null |
594 |
@@ -1,274 +0,0 @@ |
595 |
-# Copyright 1999-2019 Gentoo Authors |
596 |
-# Distributed under the terms of the GNU General Public License v2 |
597 |
- |
598 |
-EAPI=6 |
599 |
-inherit autotools linux-info multilib systemd toolchain-funcs udev flag-o-matic usr-ldscript |
600 |
- |
601 |
-DESCRIPTION="User-land utilities for LVM2 (device-mapper) software" |
602 |
-HOMEPAGE="https://sourceware.org/lvm2/" |
603 |
-SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz |
604 |
- ftp://sourceware.org/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz" |
605 |
- |
606 |
-LICENSE="GPL-2" |
607 |
-SLOT="0" |
608 |
-KEYWORDS="amd64 ~arm ~arm64 ~mips ppc ppc64 x86" |
609 |
-IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only" |
610 |
-REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin ) |
611 |
- systemd? ( udev )" |
612 |
- |
613 |
-DEPEND_COMMON=" |
614 |
- dev-libs/libaio[static-libs?] |
615 |
- static? ( dev-libs/libaio[static-libs] ) |
616 |
- !static? ( dev-libs/libaio[static-libs?] ) |
617 |
- readline? ( sys-libs/readline:0= ) |
618 |
- sanlock? ( sys-cluster/sanlock ) |
619 |
- systemd? ( >=sys-apps/systemd-205:0= ) |
620 |
- udev? ( >=virtual/libudev-208:=[static-libs?] )" |
621 |
-# /run is now required for locking during early boot. /var cannot be assumed to |
622 |
-# be available -- thus, pull in recent enough baselayout for /run. |
623 |
-# This version of LVM is incompatible with cryptsetup <1.1.2. |
624 |
-RDEPEND="${DEPEND_COMMON} |
625 |
- >=sys-apps/baselayout-2.2 |
626 |
- !<sys-apps/openrc-0.11 |
627 |
- !<sys-fs/cryptsetup-1.1.2 |
628 |
- !!sys-fs/lvm-user |
629 |
- >=sys-apps/util-linux-2.16 |
630 |
- lvm2create_initrd? ( sys-apps/makedev ) |
631 |
- thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )" |
632 |
-# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check |
633 |
-# USE 'static' currently only works with eudev, bug 520450 |
634 |
-DEPEND="${DEPEND_COMMON} |
635 |
- virtual/pkgconfig |
636 |
- >=sys-devel/binutils-2.20.1-r1 |
637 |
- sys-devel/autoconf-archive |
638 |
- static? ( |
639 |
- selinux? ( sys-libs/libselinux[static-libs] ) |
640 |
- udev? ( >=sys-fs/eudev-3.1.2[static-libs] ) |
641 |
- >=sys-apps/util-linux-2.16[static-libs] |
642 |
- )" |
643 |
- |
644 |
-S=${WORKDIR}/${PN/lvm/LVM}.${PV} |
645 |
- |
646 |
-PATCHES=( |
647 |
- # Gentoo specific modification(s): |
648 |
- "${FILESDIR}"/${PN}-2.02.178-example.conf.in.patch |
649 |
- |
650 |
- # Musl fixes |
651 |
- "${FILESDIR}"/${PN}-2.02.183-fix-stdio-usage.patch |
652 |
- "${FILESDIR}"/${PN}-2.02.183-portability.patch |
653 |
- |
654 |
- # For upstream -- review and forward: |
655 |
- "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch |
656 |
- "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch |
657 |
- "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331 |
658 |
- "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373 |
659 |
- "${FILESDIR}"/${PN}-2.02.178-asneeded.patch # -Wl,--as-needed |
660 |
- "${FILESDIR}"/${PN}-2.02.178-dynamic-static-ldflags.patch #332905 |
661 |
- "${FILESDIR}"/${PN}-2.02.178-static-pkgconfig-libs.patch #370217, #439414 + blkid |
662 |
- "${FILESDIR}"/${PN}-2.02.176-pthread-pkgconfig.patch #492450 |
663 |
- "${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756 |
664 |
- "${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446 |
665 |
- #"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream |
666 |
- "${FILESDIR}"/${PN}-2.02.184-dmeventd-no-idle-exit.patch |
667 |
- "${FILESDIR}"/${PN}-2.02.184-allow-reading-metadata-with-invalid-creation_time.patch #682380 |
668 |
-) |
669 |
- |
670 |
-pkg_setup() { |
671 |
- local CONFIG_CHECK="~SYSVIPC" |
672 |
- |
673 |
- if use udev; then |
674 |
- local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n" |
675 |
- if linux_config_exists; then |
676 |
- local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH) |
677 |
- if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then |
678 |
- ewarn "It's recommended to set an empty value to the following kernel config option:" |
679 |
- ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}" |
680 |
- fi |
681 |
- fi |
682 |
- fi |
683 |
- |
684 |
- check_extra_config |
685 |
- |
686 |
- # 1. Genkernel no longer copies /sbin/lvm blindly. |
687 |
- if use static; then |
688 |
- elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with" |
689 |
- elog "their static versions. If you need the static binaries," |
690 |
- elog "you must append .static to the filename!" |
691 |
- fi |
692 |
-} |
693 |
- |
694 |
-src_prepare() { |
695 |
- default |
696 |
- |
697 |
- sed -i \ |
698 |
- -e "1iAR = $(tc-getAR)" \ |
699 |
- -e "s:CC ?= @CC@:CC = $(tc-getCC):" \ |
700 |
- make.tmpl.in || die #444082 |
701 |
- |
702 |
- sed -i -e '/FLAG/s:-O2::' configure{.ac,} || die #480212 |
703 |
- |
704 |
- if use udev && ! use device-mapper-only; then |
705 |
- sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196 |
706 |
- elog "Notice that \"use_lvmetad\" setting is enabled with USE=\"udev\" in" |
707 |
- elog "/etc/lvm/lvm.conf, which will require restart of udev, lvm, and lvmetad" |
708 |
- elog "if it was previously disabled." |
709 |
- fi |
710 |
- |
711 |
- sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514 |
712 |
- |
713 |
- # Without thin-privision-tools, there is nothing to install for target install_man7: |
714 |
- if ! use thin ; then |
715 |
- sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die |
716 |
- fi |
717 |
- |
718 |
- eautoreconf |
719 |
-} |
720 |
- |
721 |
-src_configure() { |
722 |
- filter-flags -flto |
723 |
- local myeconfargs=() |
724 |
- |
725 |
- # Most of this package does weird stuff. |
726 |
- # The build options are tristate, and --without is NOT supported |
727 |
- # options: 'none', 'internal', 'shared' |
728 |
- myeconfargs+=( |
729 |
- $(use_enable !device-mapper-only dmfilemapd) |
730 |
- $(use_enable !device-mapper-only dmeventd) |
731 |
- $(use_enable !device-mapper-only cmdlib) |
732 |
- $(use_enable !device-mapper-only applib) |
733 |
- $(use_enable !device-mapper-only fsadm) |
734 |
- $(use_enable !device-mapper-only lvmetad) |
735 |
- $(use_enable !device-mapper-only lvmpolld) |
736 |
- $(usex device-mapper-only --disable-udev-systemd-background-jobs '') |
737 |
- |
738 |
- # This only causes the .static versions to become available |
739 |
- $(usex static --enable-static_link '') |
740 |
- |
741 |
- # dmeventd requires mirrors to be internal, and snapshot available |
742 |
- # so we cannot disable them |
743 |
- --with-mirrors="$(usex device-mapper-only none internal)" |
744 |
- --with-snapshots="$(usex device-mapper-only none internal)" |
745 |
- |
746 |
- # disable O_DIRECT support on hppa, breaks pv detection (#99532) |
747 |
- $(usex hppa --disable-o_direct '') |
748 |
- ) |
749 |
- |
750 |
- if use thin; then |
751 |
- myeconfargs+=( --with-thin=internal --with-cache=internal ) |
752 |
- local texec |
753 |
- for texec in check dump repair restore; do |
754 |
- myeconfargs+=( --with-thin-${texec}="${EPREFIX}"/sbin/thin_${texec} ) |
755 |
- myeconfargs+=( --with-cache-${texec}="${EPREFIX}"/sbin/cache_${texec} ) |
756 |
- done |
757 |
- else |
758 |
- myeconfargs+=( --with-thin=none --with-cache=none ) |
759 |
- fi |
760 |
- |
761 |
- myeconfargs+=( --with-clvmd=none --with-cluster=none ) |
762 |
- |
763 |
- myeconfargs+=( |
764 |
- $(use_enable readline) |
765 |
- $(use_enable selinux) |
766 |
- --enable-pkgconfig |
767 |
- --with-confdir="${EPREFIX}"/etc |
768 |
- --exec-prefix="${EPREFIX}" |
769 |
- --sbindir="${EPREFIX}/sbin" |
770 |
- --with-staticdir="${EPREFIX}"/sbin |
771 |
- --libdir="${EPREFIX}/$(get_libdir)" |
772 |
- --with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" |
773 |
- --with-default-dm-run-dir=/run |
774 |
- --with-default-run-dir=/run/lvm |
775 |
- --with-default-locking-dir=/run/lock/lvm |
776 |
- --with-default-pid-dir=/run |
777 |
- $(use_enable udev udev_rules) |
778 |
- $(use_enable udev udev_sync) |
779 |
- $(use_with udev udevdir "$(get_udevdir)"/rules.d) |
780 |
- $(use_enable sanlock lvmlockd-sanlock) |
781 |
- $(use_enable systemd udev-systemd-background-jobs) |
782 |
- $(use_enable systemd notify-dbus) |
783 |
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" |
784 |
- CLDFLAGS="${LDFLAGS}" |
785 |
- ) |
786 |
- econf "${myeconfargs[@]}" |
787 |
-} |
788 |
- |
789 |
-src_compile() { |
790 |
- pushd include >/dev/null |
791 |
- emake |
792 |
- popd >/dev/null |
793 |
- |
794 |
- if use device-mapper-only ; then |
795 |
- emake device-mapper |
796 |
- else |
797 |
- emake |
798 |
- emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat |
799 |
- fi |
800 |
-} |
801 |
- |
802 |
-src_install() { |
803 |
- local inst INSTALL_TARGETS |
804 |
- INSTALL_TARGETS=( install install_tmpfiles_configuration ) |
805 |
- # install systemd related files only when requested, bug #522430 |
806 |
- use systemd && INSTALL_TARGETS+=( install_systemd_units install_systemd_generators ) |
807 |
- use device-mapper-only && INSTALL_TARGETS=( install_device-mapper ) |
808 |
- for inst in ${INSTALL_TARGETS[@]}; do |
809 |
- emake DESTDIR="${D}" ${inst} |
810 |
- done |
811 |
- |
812 |
- newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper |
813 |
- newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper |
814 |
- |
815 |
- if use !device-mapper-only ; then |
816 |
- newinitd "${FILESDIR}"/dmeventd.initd-2.02.184-r2 dmeventd |
817 |
- newinitd "${FILESDIR}"/lvm.rc-2.02.184-r3 lvm |
818 |
- newconfd "${FILESDIR}"/lvm.confd-2.02.184-r3 lvm |
819 |
- if ! use udev ; then |
820 |
- # We keep the variable but remove udev from it. |
821 |
- sed -r -i \ |
822 |
- -e '/^rc_need=/s/\<udev\>//g' \ |
823 |
- "${ED}/etc/conf.d/lvm" || die "Could not drop udev from rc_need" |
824 |
- fi |
825 |
- |
826 |
- newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring |
827 |
- newinitd "${FILESDIR}"/lvmetad.initd-2.02.116-r3 lvmetad |
828 |
- newinitd "${FILESDIR}"/lvmpolld.initd-2.02.183 lvmpolld |
829 |
- fi |
830 |
- |
831 |
- if use sanlock; then |
832 |
- newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd |
833 |
- fi |
834 |
- |
835 |
- if use static-libs; then |
836 |
- dolib.a libdm/ioctl/libdevmapper.a |
837 |
- dolib.a libdaemon/client/libdaemonclient.a #462908 |
838 |
- #gen_usr_ldscript libdevmapper.so |
839 |
- dolib.a daemons/dmeventd/libdevmapper-event.a |
840 |
- #gen_usr_ldscript libdevmapper-event.so |
841 |
- else |
842 |
- rm -f "${ED%/}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a |
843 |
- fi |
844 |
- |
845 |
- if use lvm2create_initrd; then |
846 |
- dosbin scripts/lvm2create_initrd/lvm2create_initrd |
847 |
- doman scripts/lvm2create_initrd/lvm2create_initrd.8 |
848 |
- newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd |
849 |
- fi |
850 |
- |
851 |
- insinto /etc |
852 |
- doins "${FILESDIR}"/dmtab |
853 |
- |
854 |
- dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf |
855 |
-} |
856 |
- |
857 |
-pkg_postinst() { |
858 |
- ewarn "Make sure the \"lvm\" init script is in the runlevels:" |
859 |
- ewarn "# rc-update add lvm boot" |
860 |
- ewarn |
861 |
- ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want" |
862 |
- ewarn "to enable lvm autoactivation and metadata caching." |
863 |
-} |
864 |
- |
865 |
-src_test() { |
866 |
- einfo "Tests are disabled because of device-node mucking, if you want to" |
867 |
- einfo "run tests, compile the package and see ${S}/tests" |
868 |
-} |
869 |
|
870 |
diff --git a/sys-fs/lvm2/lvm2-2.02.184-r5.ebuild b/sys-fs/lvm2/lvm2-2.02.184-r5.ebuild |
871 |
deleted file mode 100644 |
872 |
index c4be7f0..0000000 |
873 |
--- a/sys-fs/lvm2/lvm2-2.02.184-r5.ebuild |
874 |
+++ /dev/null |
875 |
@@ -1,276 +0,0 @@ |
876 |
-# Copyright 1999-2019 Gentoo Authors |
877 |
-# Distributed under the terms of the GNU General Public License v2 |
878 |
- |
879 |
-EAPI=6 |
880 |
-inherit autotools linux-info multilib systemd toolchain-funcs udev flag-o-matic |
881 |
- |
882 |
-DESCRIPTION="User-land utilities for LVM2 (device-mapper) software" |
883 |
-HOMEPAGE="https://sourceware.org/lvm2/" |
884 |
-SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz |
885 |
- ftp://sourceware.org/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz" |
886 |
- |
887 |
-LICENSE="GPL-2" |
888 |
-SLOT="0" |
889 |
-KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86" |
890 |
-IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only" |
891 |
-REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin ) |
892 |
- systemd? ( udev )" |
893 |
- |
894 |
-DEPEND_COMMON=" |
895 |
- dev-libs/libaio[static-libs?] |
896 |
- static? ( dev-libs/libaio[static-libs] ) |
897 |
- !static? ( dev-libs/libaio[static-libs?] ) |
898 |
- readline? ( sys-libs/readline:0= ) |
899 |
- sanlock? ( sys-cluster/sanlock ) |
900 |
- systemd? ( >=sys-apps/systemd-205:0= ) |
901 |
- udev? ( >=virtual/libudev-208:=[static-libs(-)?] )" |
902 |
-# /run is now required for locking during early boot. /var cannot be assumed to |
903 |
-# be available -- thus, pull in recent enough baselayout for /run. |
904 |
-# This version of LVM is incompatible with cryptsetup <1.1.2. |
905 |
-RDEPEND="${DEPEND_COMMON} |
906 |
- >=sys-apps/baselayout-2.2 |
907 |
- !<sys-apps/openrc-0.11 |
908 |
- !<sys-fs/cryptsetup-1.1.2 |
909 |
- !!sys-fs/lvm-user |
910 |
- >=sys-apps/util-linux-2.16 |
911 |
- lvm2create_initrd? ( sys-apps/makedev ) |
912 |
- thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )" |
913 |
-# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check |
914 |
-# USE 'static' currently only works with eudev, bug 520450 |
915 |
-DEPEND="${DEPEND_COMMON} |
916 |
- virtual/pkgconfig |
917 |
- >=sys-devel/binutils-2.20.1-r1 |
918 |
- sys-devel/autoconf-archive |
919 |
- static? ( |
920 |
- selinux? ( sys-libs/libselinux[static-libs] ) |
921 |
- udev? ( >=sys-fs/eudev-3.1.2[static-libs] ) |
922 |
- >=sys-apps/util-linux-2.16[static-libs] |
923 |
- )" |
924 |
- |
925 |
-S=${WORKDIR}/${PN/lvm/LVM}.${PV} |
926 |
- |
927 |
-PATCHES=( |
928 |
- # Gentoo specific modification(s): |
929 |
- "${FILESDIR}"/${PN}-2.02.178-example.conf.in.patch |
930 |
- |
931 |
- # Musl fixes |
932 |
- "${FILESDIR}"/${PN}-2.02.183-fix-stdio-usage.patch |
933 |
- "${FILESDIR}"/${PN}-2.02.183-portability.patch |
934 |
- "${FILESDIR}"/${PN}-2.02.183-implement-libc-specific-reopen_stream.patch |
935 |
- |
936 |
- # For upstream -- review and forward: |
937 |
- "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch |
938 |
- "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch |
939 |
- "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331 |
940 |
- "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373 |
941 |
- "${FILESDIR}"/${PN}-2.02.178-asneeded.patch # -Wl,--as-needed |
942 |
- "${FILESDIR}"/${PN}-2.02.178-dynamic-static-ldflags.patch #332905 |
943 |
- "${FILESDIR}"/${PN}-2.02.178-static-pkgconfig-libs.patch #370217, #439414 + blkid |
944 |
- "${FILESDIR}"/${PN}-2.02.176-pthread-pkgconfig.patch #492450 |
945 |
- "${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756 |
946 |
- "${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446 |
947 |
- #"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream |
948 |
- "${FILESDIR}"/${PN}-2.02.184-dmeventd-no-idle-exit.patch |
949 |
- "${FILESDIR}"/${PN}-2.02.184-allow-reading-metadata-with-invalid-creation_time.patch #682380 |
950 |
-) |
951 |
- |
952 |
-pkg_setup() { |
953 |
- local CONFIG_CHECK="~SYSVIPC" |
954 |
- |
955 |
- if use udev; then |
956 |
- local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n" |
957 |
- if linux_config_exists; then |
958 |
- local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH) |
959 |
- if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then |
960 |
- ewarn "It's recommended to set an empty value to the following kernel config option:" |
961 |
- ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}" |
962 |
- fi |
963 |
- fi |
964 |
- fi |
965 |
- |
966 |
- check_extra_config |
967 |
- |
968 |
- # 1. Genkernel no longer copies /sbin/lvm blindly. |
969 |
- if use static; then |
970 |
- elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with" |
971 |
- elog "their static versions. If you need the static binaries," |
972 |
- elog "you must append .static to the filename!" |
973 |
- fi |
974 |
-} |
975 |
- |
976 |
-src_prepare() { |
977 |
- default |
978 |
- |
979 |
- sed -i \ |
980 |
- -e "1iAR = $(tc-getAR)" \ |
981 |
- -e "s:CC ?= @CC@:CC = $(tc-getCC):" \ |
982 |
- make.tmpl.in || die #444082 |
983 |
- |
984 |
- sed -i -e '/FLAG/s:-O2::' configure{.ac,} || die #480212 |
985 |
- |
986 |
- if use udev && ! use device-mapper-only; then |
987 |
- sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196 |
988 |
- elog "Notice that \"use_lvmetad\" setting is enabled with USE=\"udev\" in" |
989 |
- elog "/etc/lvm/lvm.conf, which will require restart of udev, lvm, and lvmetad" |
990 |
- elog "if it was previously disabled." |
991 |
- fi |
992 |
- |
993 |
- sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514 |
994 |
- |
995 |
- # Without thin-privision-tools, there is nothing to install for target install_man7: |
996 |
- if ! use thin ; then |
997 |
- sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die |
998 |
- fi |
999 |
- |
1000 |
- eautoreconf |
1001 |
-} |
1002 |
- |
1003 |
-src_configure() { |
1004 |
- filter-flags -flto |
1005 |
- local myeconfargs=() |
1006 |
- |
1007 |
- # Most of this package does weird stuff. |
1008 |
- # The build options are tristate, and --without is NOT supported |
1009 |
- # options: 'none', 'internal', 'shared' |
1010 |
- myeconfargs+=( |
1011 |
- $(use_enable !device-mapper-only dmfilemapd) |
1012 |
- $(use_enable !device-mapper-only dmeventd) |
1013 |
- $(use_enable !device-mapper-only cmdlib) |
1014 |
- $(use_enable !device-mapper-only applib) |
1015 |
- $(use_enable !device-mapper-only fsadm) |
1016 |
- $(use_enable !device-mapper-only lvmetad) |
1017 |
- $(use_enable !device-mapper-only lvmpolld) |
1018 |
- $(usex device-mapper-only --disable-udev-systemd-background-jobs '') |
1019 |
- |
1020 |
- # This only causes the .static versions to become available |
1021 |
- $(usex static --enable-static_link '') |
1022 |
- |
1023 |
- # dmeventd requires mirrors to be internal, and snapshot available |
1024 |
- # so we cannot disable them |
1025 |
- --with-mirrors="$(usex device-mapper-only none internal)" |
1026 |
- --with-snapshots="$(usex device-mapper-only none internal)" |
1027 |
- |
1028 |
- # disable O_DIRECT support on hppa, breaks pv detection (#99532) |
1029 |
- $(usex hppa --disable-o_direct '') |
1030 |
- ) |
1031 |
- |
1032 |
- if use thin; then |
1033 |
- myeconfargs+=( --with-thin=internal --with-cache=internal ) |
1034 |
- local texec |
1035 |
- for texec in check dump repair restore; do |
1036 |
- myeconfargs+=( --with-thin-${texec}="${EPREFIX}"/sbin/thin_${texec} ) |
1037 |
- myeconfargs+=( --with-cache-${texec}="${EPREFIX}"/sbin/cache_${texec} ) |
1038 |
- done |
1039 |
- else |
1040 |
- myeconfargs+=( --with-thin=none --with-cache=none ) |
1041 |
- fi |
1042 |
- |
1043 |
- myeconfargs+=( --with-clvmd=none --with-cluster=none ) |
1044 |
- |
1045 |
- myeconfargs+=( |
1046 |
- $(use_enable readline) |
1047 |
- $(use_enable selinux) |
1048 |
- --enable-pkgconfig |
1049 |
- --with-confdir="${EPREFIX}"/etc |
1050 |
- --exec-prefix="${EPREFIX}" |
1051 |
- --sbindir="${EPREFIX}/sbin" |
1052 |
- --with-staticdir="${EPREFIX}"/sbin |
1053 |
- --libdir="${EPREFIX}/$(get_libdir)" |
1054 |
- --with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" |
1055 |
- --with-default-dm-run-dir=/run |
1056 |
- --with-default-run-dir=/run/lvm |
1057 |
- --with-default-locking-dir=/run/lock/lvm |
1058 |
- --with-default-pid-dir=/run |
1059 |
- $(use_enable udev udev_rules) |
1060 |
- $(use_enable udev udev_sync) |
1061 |
- $(use_with udev udevdir "$(get_udevdir)"/rules.d) |
1062 |
- $(use_enable sanlock lvmlockd-sanlock) |
1063 |
- $(use_enable systemd udev-systemd-background-jobs) |
1064 |
- $(use_enable systemd notify-dbus) |
1065 |
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" |
1066 |
- CLDFLAGS="${LDFLAGS}" |
1067 |
- ) |
1068 |
- # Hard-wire this to bash as some shells (dash) don't know |
1069 |
- # "-o pipefail" #682404 |
1070 |
- CONFIG_SHELL="/bin/bash" \ |
1071 |
- econf "${myeconfargs[@]}" |
1072 |
-} |
1073 |
- |
1074 |
-src_compile() { |
1075 |
- pushd include >/dev/null |
1076 |
- emake |
1077 |
- popd >/dev/null |
1078 |
- |
1079 |
- if use device-mapper-only ; then |
1080 |
- emake device-mapper |
1081 |
- else |
1082 |
- emake |
1083 |
- emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat |
1084 |
- fi |
1085 |
-} |
1086 |
- |
1087 |
-src_install() { |
1088 |
- local inst INSTALL_TARGETS |
1089 |
- INSTALL_TARGETS=( install install_tmpfiles_configuration ) |
1090 |
- # install systemd related files only when requested, bug #522430 |
1091 |
- use systemd && INSTALL_TARGETS+=( install_systemd_units install_systemd_generators ) |
1092 |
- use device-mapper-only && INSTALL_TARGETS=( install_device-mapper ) |
1093 |
- for inst in ${INSTALL_TARGETS[@]}; do |
1094 |
- emake DESTDIR="${D}" ${inst} |
1095 |
- done |
1096 |
- |
1097 |
- newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper |
1098 |
- newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper |
1099 |
- |
1100 |
- if use !device-mapper-only ; then |
1101 |
- newinitd "${FILESDIR}"/dmeventd.initd-2.02.184-r2 dmeventd |
1102 |
- newinitd "${FILESDIR}"/lvm.rc-2.02.184-r3 lvm |
1103 |
- newconfd "${FILESDIR}"/lvm.confd-2.02.184-r3 lvm |
1104 |
- if ! use udev ; then |
1105 |
- # We keep the variable but remove udev from it. |
1106 |
- sed -r -i \ |
1107 |
- -e '/^rc_need=/s/\<udev\>//g' \ |
1108 |
- "${ED}/etc/conf.d/lvm" || die "Could not drop udev from rc_need" |
1109 |
- fi |
1110 |
- |
1111 |
- newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring |
1112 |
- newinitd "${FILESDIR}"/lvmetad.initd-2.02.116-r3 lvmetad |
1113 |
- newinitd "${FILESDIR}"/lvmpolld.initd-2.02.183 lvmpolld |
1114 |
- fi |
1115 |
- |
1116 |
- if use sanlock; then |
1117 |
- newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd |
1118 |
- fi |
1119 |
- |
1120 |
- if use static-libs; then |
1121 |
- dolib.a libdm/ioctl/libdevmapper.a |
1122 |
- dolib.a libdaemon/client/libdaemonclient.a #462908 |
1123 |
- dolib.a daemons/dmeventd/libdevmapper-event.a |
1124 |
- else |
1125 |
- rm -f "${ED%/}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a |
1126 |
- fi |
1127 |
- |
1128 |
- if use lvm2create_initrd; then |
1129 |
- dosbin scripts/lvm2create_initrd/lvm2create_initrd |
1130 |
- doman scripts/lvm2create_initrd/lvm2create_initrd.8 |
1131 |
- newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd |
1132 |
- fi |
1133 |
- |
1134 |
- insinto /etc |
1135 |
- doins "${FILESDIR}"/dmtab |
1136 |
- |
1137 |
- dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf |
1138 |
-} |
1139 |
- |
1140 |
-pkg_postinst() { |
1141 |
- ewarn "Make sure the \"lvm\" init script is in the runlevels:" |
1142 |
- ewarn "# rc-update add lvm boot" |
1143 |
- ewarn |
1144 |
- ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want" |
1145 |
- ewarn "to enable lvm autoactivation and metadata caching." |
1146 |
-} |
1147 |
- |
1148 |
-src_test() { |
1149 |
- einfo "Tests are disabled because of device-node mucking, if you want to" |
1150 |
- einfo "run tests, compile the package and see ${S}/tests" |
1151 |
-} |
1152 |
|
1153 |
diff --git a/sys-fs/lvm2/lvm2-2.02.184.ebuild b/sys-fs/lvm2/lvm2-2.02.184.ebuild |
1154 |
deleted file mode 100644 |
1155 |
index cbe25b9..0000000 |
1156 |
--- a/sys-fs/lvm2/lvm2-2.02.184.ebuild |
1157 |
+++ /dev/null |
1158 |
@@ -1,262 +0,0 @@ |
1159 |
-# Copyright 1999-2019 Gentoo Authors |
1160 |
-# Distributed under the terms of the GNU General Public License v2 |
1161 |
- |
1162 |
-EAPI=6 |
1163 |
-inherit autotools linux-info multilib systemd toolchain-funcs udev flag-o-matic usr-ldscript |
1164 |
- |
1165 |
-DESCRIPTION="User-land utilities for LVM2 (device-mapper) software" |
1166 |
-HOMEPAGE="https://sourceware.org/lvm2/" |
1167 |
-SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz |
1168 |
- ftp://sourceware.org/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz" |
1169 |
- |
1170 |
-LICENSE="GPL-2" |
1171 |
-SLOT="0" |
1172 |
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86" |
1173 |
-IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only" |
1174 |
-REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin ) |
1175 |
- systemd? ( udev )" |
1176 |
- |
1177 |
-DEPEND_COMMON=" |
1178 |
- dev-libs/libaio[static-libs?] |
1179 |
- static? ( dev-libs/libaio[static-libs] ) |
1180 |
- !static? ( dev-libs/libaio[static-libs?] ) |
1181 |
- readline? ( sys-libs/readline:0= ) |
1182 |
- sanlock? ( sys-cluster/sanlock ) |
1183 |
- systemd? ( >=sys-apps/systemd-205:0= ) |
1184 |
- udev? ( >=virtual/libudev-208:=[static-libs?] )" |
1185 |
-# /run is now required for locking during early boot. /var cannot be assumed to |
1186 |
-# be available -- thus, pull in recent enough baselayout for /run. |
1187 |
-# This version of LVM is incompatible with cryptsetup <1.1.2. |
1188 |
-RDEPEND="${DEPEND_COMMON} |
1189 |
- >=sys-apps/baselayout-2.2 |
1190 |
- !<sys-apps/openrc-0.11 |
1191 |
- !<sys-fs/cryptsetup-1.1.2 |
1192 |
- !!sys-fs/lvm-user |
1193 |
- >=sys-apps/util-linux-2.16 |
1194 |
- lvm2create_initrd? ( sys-apps/makedev ) |
1195 |
- thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )" |
1196 |
-# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check |
1197 |
-# USE 'static' currently only works with eudev, bug 520450 |
1198 |
-DEPEND="${DEPEND_COMMON} |
1199 |
- virtual/pkgconfig |
1200 |
- >=sys-devel/binutils-2.20.1-r1 |
1201 |
- sys-devel/autoconf-archive |
1202 |
- static? ( |
1203 |
- selinux? ( sys-libs/libselinux[static-libs] ) |
1204 |
- udev? ( >=sys-fs/eudev-3.1.2[static-libs] ) |
1205 |
- >=sys-apps/util-linux-2.16[static-libs] |
1206 |
- )" |
1207 |
- |
1208 |
-S=${WORKDIR}/${PN/lvm/LVM}.${PV} |
1209 |
- |
1210 |
-PATCHES=( |
1211 |
- # Gentoo specific modification(s): |
1212 |
- "${FILESDIR}"/${PN}-2.02.178-example.conf.in.patch |
1213 |
- |
1214 |
- # Musl fixes |
1215 |
- "${FILESDIR}"/${PN}-2.02.183-fix-stdio-usage.patch |
1216 |
- "${FILESDIR}"/${PN}-2.02.183-portability.patch |
1217 |
- |
1218 |
- # For upstream -- review and forward: |
1219 |
- "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch |
1220 |
- "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch |
1221 |
- "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331 |
1222 |
- "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373 |
1223 |
- "${FILESDIR}"/${PN}-2.02.178-asneeded.patch # -Wl,--as-needed |
1224 |
- "${FILESDIR}"/${PN}-2.02.178-dynamic-static-ldflags.patch #332905 |
1225 |
- "${FILESDIR}"/${PN}-2.02.178-static-pkgconfig-libs.patch #370217, #439414 + blkid |
1226 |
- "${FILESDIR}"/${PN}-2.02.176-pthread-pkgconfig.patch #492450 |
1227 |
- "${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756 |
1228 |
- "${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446 |
1229 |
- #"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream |
1230 |
-) |
1231 |
- |
1232 |
-pkg_setup() { |
1233 |
- local CONFIG_CHECK="~SYSVIPC" |
1234 |
- |
1235 |
- if use udev; then |
1236 |
- local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n" |
1237 |
- if linux_config_exists; then |
1238 |
- local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH) |
1239 |
- if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then |
1240 |
- ewarn "It's recommended to set an empty value to the following kernel config option:" |
1241 |
- ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}" |
1242 |
- fi |
1243 |
- fi |
1244 |
- fi |
1245 |
- |
1246 |
- check_extra_config |
1247 |
- |
1248 |
- # 1. Genkernel no longer copies /sbin/lvm blindly. |
1249 |
- if use static; then |
1250 |
- elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with" |
1251 |
- elog "their static versions. If you need the static binaries," |
1252 |
- elog "you must append .static to the filename!" |
1253 |
- fi |
1254 |
-} |
1255 |
- |
1256 |
-src_prepare() { |
1257 |
- default |
1258 |
- |
1259 |
- sed -i \ |
1260 |
- -e "1iAR = $(tc-getAR)" \ |
1261 |
- -e "s:CC ?= @CC@:CC = $(tc-getCC):" \ |
1262 |
- make.tmpl.in || die #444082 |
1263 |
- |
1264 |
- sed -i -e '/FLAG/s:-O2::' configure{.ac,} || die #480212 |
1265 |
- |
1266 |
- if use udev && ! use device-mapper-only; then |
1267 |
- sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196 |
1268 |
- elog "Notice that \"use_lvmetad\" setting is enabled with USE=\"udev\" in" |
1269 |
- elog "/etc/lvm/lvm.conf, which will require restart of udev, lvm, and lvmetad" |
1270 |
- elog "if it was previously disabled." |
1271 |
- fi |
1272 |
- |
1273 |
- sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514 |
1274 |
- |
1275 |
- # Without thin-privision-tools, there is nothing to install for target install_man7: |
1276 |
- if ! use thin ; then |
1277 |
- sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die |
1278 |
- fi |
1279 |
- |
1280 |
- eautoreconf |
1281 |
-} |
1282 |
- |
1283 |
-src_configure() { |
1284 |
- filter-flags -flto |
1285 |
- local myeconfargs=() |
1286 |
- |
1287 |
- # Most of this package does weird stuff. |
1288 |
- # The build options are tristate, and --without is NOT supported |
1289 |
- # options: 'none', 'internal', 'shared' |
1290 |
- myeconfargs+=( |
1291 |
- $(use_enable !device-mapper-only dmeventd) |
1292 |
- $(use_enable !device-mapper-only cmdlib) |
1293 |
- $(use_enable !device-mapper-only applib) |
1294 |
- $(use_enable !device-mapper-only fsadm) |
1295 |
- $(use_enable !device-mapper-only lvmetad) |
1296 |
- $(usex device-mapper-only --disable-udev-systemd-background-jobs '') |
1297 |
- |
1298 |
- # This only causes the .static versions to become available |
1299 |
- $(usex static --enable-static_link '') |
1300 |
- |
1301 |
- # dmeventd requires mirrors to be internal, and snapshot available |
1302 |
- # so we cannot disable them |
1303 |
- --with-mirrors="$(usex device-mapper-only none internal)" |
1304 |
- --with-snapshots="$(usex device-mapper-only none internal)" |
1305 |
- |
1306 |
- # disable O_DIRECT support on hppa, breaks pv detection (#99532) |
1307 |
- $(usex hppa --disable-o_direct '') |
1308 |
- ) |
1309 |
- |
1310 |
- if use thin; then |
1311 |
- myeconfargs+=( --with-thin=internal --with-cache=internal ) |
1312 |
- local texec |
1313 |
- for texec in check dump repair restore; do |
1314 |
- myeconfargs+=( --with-thin-${texec}="${EPREFIX}"/sbin/thin_${texec} ) |
1315 |
- myeconfargs+=( --with-cache-${texec}="${EPREFIX}"/sbin/cache_${texec} ) |
1316 |
- done |
1317 |
- else |
1318 |
- myeconfargs+=( --with-thin=none --with-cache=none ) |
1319 |
- fi |
1320 |
- |
1321 |
- myeconfargs+=( --with-clvmd=none --with-cluster=none ) |
1322 |
- |
1323 |
- myeconfargs+=( |
1324 |
- $(use_enable readline) |
1325 |
- $(use_enable selinux) |
1326 |
- --enable-pkgconfig |
1327 |
- --with-confdir="${EPREFIX}"/etc |
1328 |
- --exec-prefix="${EPREFIX}" |
1329 |
- --sbindir="${EPREFIX}/sbin" |
1330 |
- --with-staticdir="${EPREFIX}"/sbin |
1331 |
- --libdir="${EPREFIX}/$(get_libdir)" |
1332 |
- --with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" |
1333 |
- --with-default-dm-run-dir=/run |
1334 |
- --with-default-run-dir=/run/lvm |
1335 |
- --with-default-locking-dir=/run/lock/lvm |
1336 |
- --with-default-pid-dir=/run |
1337 |
- $(use_enable udev udev_rules) |
1338 |
- $(use_enable udev udev_sync) |
1339 |
- $(use_with udev udevdir "$(get_udevdir)"/rules.d) |
1340 |
- $(use_enable sanlock lvmlockd-sanlock) |
1341 |
- $(use_enable systemd udev-systemd-background-jobs) |
1342 |
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" |
1343 |
- CLDFLAGS="${LDFLAGS}" |
1344 |
- ) |
1345 |
- econf "${myeconfargs[@]}" |
1346 |
-} |
1347 |
- |
1348 |
-src_compile() { |
1349 |
- pushd include >/dev/null |
1350 |
- emake |
1351 |
- popd >/dev/null |
1352 |
- |
1353 |
- if use device-mapper-only ; then |
1354 |
- emake device-mapper |
1355 |
- else |
1356 |
- emake |
1357 |
- emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat |
1358 |
- fi |
1359 |
-} |
1360 |
- |
1361 |
-src_install() { |
1362 |
- local inst INSTALL_TARGETS |
1363 |
- INSTALL_TARGETS=( install install_tmpfiles_configuration ) |
1364 |
- # install systemd related files only when requested, bug #522430 |
1365 |
- use systemd && INSTALL_TARGETS+=( install_systemd_units install_systemd_generators ) |
1366 |
- use device-mapper-only && INSTALL_TARGETS=( install_device-mapper ) |
1367 |
- for inst in ${INSTALL_TARGETS[@]}; do |
1368 |
- emake DESTDIR="${D}" ${inst} |
1369 |
- done |
1370 |
- |
1371 |
- newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper |
1372 |
- newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper |
1373 |
- |
1374 |
- if use !device-mapper-only ; then |
1375 |
- newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd |
1376 |
- newinitd "${FILESDIR}"/lvm.rc-2.02.172 lvm |
1377 |
- newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm |
1378 |
- |
1379 |
- newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring |
1380 |
- newinitd "${FILESDIR}"/lvmetad.initd-2.02.116-r3 lvmetad |
1381 |
- fi |
1382 |
- |
1383 |
- if use sanlock; then |
1384 |
- newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd |
1385 |
- fi |
1386 |
- |
1387 |
- if use static-libs; then |
1388 |
- dolib.a libdm/ioctl/libdevmapper.a |
1389 |
- dolib.a libdaemon/client/libdaemonclient.a #462908 |
1390 |
- #gen_usr_ldscript libdevmapper.so |
1391 |
- dolib.a daemons/dmeventd/libdevmapper-event.a |
1392 |
- #gen_usr_ldscript libdevmapper-event.so |
1393 |
- else |
1394 |
- rm -f "${ED%/}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a |
1395 |
- fi |
1396 |
- |
1397 |
- if use lvm2create_initrd; then |
1398 |
- dosbin scripts/lvm2create_initrd/lvm2create_initrd |
1399 |
- doman scripts/lvm2create_initrd/lvm2create_initrd.8 |
1400 |
- newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd |
1401 |
- fi |
1402 |
- |
1403 |
- insinto /etc |
1404 |
- doins "${FILESDIR}"/dmtab |
1405 |
- |
1406 |
- dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf |
1407 |
-} |
1408 |
- |
1409 |
-pkg_postinst() { |
1410 |
- ewarn "Make sure the \"lvm\" init script is in the runlevels:" |
1411 |
- ewarn "# rc-update add lvm boot" |
1412 |
- ewarn |
1413 |
- ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want" |
1414 |
- ewarn "to enable lvm autoactivation and metadata caching." |
1415 |
-} |
1416 |
- |
1417 |
-src_test() { |
1418 |
- einfo "Tests are disabled because of device-node mucking, if you want to" |
1419 |
- einfo "run tests, compile the package and see ${S}/tests" |
1420 |
-} |
1421 |
|
1422 |
diff --git a/sys-fs/lvm2/lvm2-2.02.186-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild |
1423 |
similarity index 98% |
1424 |
rename from sys-fs/lvm2/lvm2-2.02.186-r2.ebuild |
1425 |
rename to sys-fs/lvm2/lvm2-2.02.187-r2.ebuild |
1426 |
index cdd8f6e..a134187 100644 |
1427 |
--- a/sys-fs/lvm2/lvm2-2.02.186-r2.ebuild |
1428 |
+++ b/sys-fs/lvm2/lvm2-2.02.187-r2.ebuild |
1429 |
@@ -1,4 +1,4 @@ |
1430 |
-# Copyright 1999-2019 Gentoo Authors |
1431 |
+# Copyright 1999-2020 Gentoo Authors |
1432 |
# Distributed under the terms of the GNU General Public License v2 |
1433 |
|
1434 |
EAPI=7 |
1435 |
@@ -11,7 +11,7 @@ SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz |
1436 |
|
1437 |
LICENSE="GPL-2" |
1438 |
SLOT="0" |
1439 |
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86" |
1440 |
+KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86" |
1441 |
IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only" |
1442 |
REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin ) |
1443 |
systemd? ( udev )" |
1444 |
@@ -227,7 +227,7 @@ src_install() { |
1445 |
|
1446 |
if use !device-mapper-only ; then |
1447 |
newinitd "${FILESDIR}"/dmeventd.initd-2.02.184-r2 dmeventd |
1448 |
- newinitd "${FILESDIR}"/lvm.rc-2.02.184-r3 lvm |
1449 |
+ newinitd "${FILESDIR}"/lvm.rc-2.02.187 lvm |
1450 |
newconfd "${FILESDIR}"/lvm.confd-2.02.184-r3 lvm |
1451 |
if ! use udev ; then |
1452 |
# We keep the variable but remove udev from it. |