1 |
commit: 9dc859090c6d45ef63d059138984aca4295f06b6 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Mar 26 20:23:50 2020 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 26 20:24:02 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9dc85909 |
7 |
|
8 |
sys-fs/lvm2: Removed old |
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 | 2 - |
14 |
sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1 | 25 -- |
15 |
sys-fs/lvm2/files/lvm.confd-2.02.28-r2 | 5 - |
16 |
sys-fs/lvm2/files/lvm.rc-2.02.105-r2 | 96 -------- |
17 |
.../files/lvm2-2.02.106-pthread-pkgconfig.patch | 32 --- |
18 |
.../lvm2/files/lvm2-2.02.108-example.conf.in.patch | 50 ---- |
19 |
.../lvm2-2.02.108-static-pkgconfig-libs.patch | 104 --------- |
20 |
.../lvm2/files/lvm2-2.02.129-example.conf.in.patch | 52 ----- |
21 |
.../lvm2-2.02.129-static-pkgconfig-libs.patch | 102 --------- |
22 |
.../files/lvm2-2.02.130-pthread-pkgconfig.patch | 32 --- |
23 |
.../lvm2-2.02.139-dynamic-static-ldflags.patch | 63 ----- |
24 |
sys-fs/lvm2/files/lvm2-2.02.145-mkdev.patch | 127 ----------- |
25 |
sys-fs/lvm2/files/lvm2-2.02.70-asneeded.patch | 15 -- |
26 |
sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2 | 12 - |
27 |
sys-fs/lvm2/lvm2-2.02.116.ebuild | 243 -------------------- |
28 |
sys-fs/lvm2/lvm2-2.02.145-r2.ebuild | 254 --------------------- |
29 |
sys-fs/lvm2/metadata.xml | 1 - |
30 |
17 files changed, 1215 deletions(-) |
31 |
|
32 |
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest |
33 |
index d3185d0649c..70cf42f7af5 100644 |
34 |
--- a/sys-fs/lvm2/Manifest |
35 |
+++ b/sys-fs/lvm2/Manifest |
36 |
@@ -1,5 +1,3 @@ |
37 |
-DIST LVM2.2.02.116.tgz 1538340 BLAKE2B 718261b60626f2eca5ba13011646bf551523ed8e59aaceceb9097221c000268b7533ac43151ff1d9229911d87e764fbdb29ffa1d305f2aae99220a68e301559a SHA512 992541339637d597257850b4ff7f5348fb7cdcccf806ac8d986a3be1ad1edc5f6bfaedeed5128690c541d1a485cdc75742e90a766363c39867901003518fb84d |
38 |
-DIST LVM2.2.02.145.tgz 1986370 BLAKE2B 0c9e5efae17f26ff86152cecbf0b11a74e85007b2fa9491f44dec03ac8c11375bacf6685213b4be19037c8fbf70e13549516716ecf8fa262919a44625e6aab34 SHA512 84e28b3efc940837ea9da70fce620744aea0945ba29383b76ad7bcd4b5259b897c714162a8e8b7cfe26ae736a3ad2eca633a3e0df4d6280a32b28bd4cf472d27 |
39 |
DIST LVM2.2.02.184.tgz 2383698 BLAKE2B b6e308d76d541b9461dfcc6e82db256a175ccdabfae9c9d57d84eabd0d5ea50e3e09954b34741903e027412c2c26f72a5005fe934261576337a810738139deb8 SHA512 9db74f675e7c58f663a39afb79b6f33a33ad2cfbda63e9783ef5027f33977b4a1262a2e6754aa67c586eed083ee119a2e837c32a7746dcc53f13877c9d65c390 |
40 |
DIST LVM2.2.02.186.tgz 2389759 BLAKE2B e094c0135d455386ea5789208899d4dbdd5e78bebf52e49ab5587f881fbc2b94c6accecacf1b4ed182b0c87046402c00a47a1b724795a94fe3ec998b580a77ae SHA512 06a1c00142ee41d8a576a5e06a5beae70baced3020e753ce3b612355cc4d9e33be4acf58569d49436c4ee1118d288d884c7301b7d886074eaf9f2fa6b0248c03 |
41 |
DIST LVM2.2.02.187.tgz 2405544 BLAKE2B be804be3c64927a8848e8ea8de228fb563b6f8c22628b785aabb33fc993629e5370788216bd814246aeb3a5546fd5446383ce24342e716579887556edf2bbed2 SHA512 3ce56f0c0d2e7dbcdae5be263199f73ee5c4c052599d53cde9b16500a326d0340893344f4671839be06b5b4225d592175d01c9974db14f2dc220d6e9a1d47e91 |
42 |
|
43 |
diff --git a/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1 b/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1 |
44 |
deleted file mode 100644 |
45 |
index f77996caa57..00000000000 |
46 |
--- a/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1 |
47 |
+++ /dev/null |
48 |
@@ -1,25 +0,0 @@ |
49 |
-#!/sbin/openrc-run |
50 |
-# Copyright 1999-2019 Gentoo Authors |
51 |
-# Distributed under the terms of the GNU General Public License v2 |
52 |
- |
53 |
-PIDFILE=/run/dmeventd.pid |
54 |
-BIN=/sbin/dmeventd |
55 |
- |
56 |
-depend() { |
57 |
- # As of .67-r1, we call ALL lvm start/stop scripts with --sysinit, that |
58 |
- # means dmeventd is NOT notified, as it cannot be safely running |
59 |
- after lvm device-mapper |
60 |
-} |
61 |
- |
62 |
-start() { |
63 |
- ebegin "Starting dmeventd" |
64 |
- start-stop-daemon --start --exec $BIN --pidfile $PIDFILE |
65 |
- eend $? |
66 |
-} |
67 |
- |
68 |
-stop() { |
69 |
- ebegin "Stopping dmeventd" |
70 |
- start-stop-daemon --stop --exec $BIN --pidfile $PIDFILE |
71 |
- eend $? |
72 |
-} |
73 |
- |
74 |
|
75 |
diff --git a/sys-fs/lvm2/files/lvm.confd-2.02.28-r2 b/sys-fs/lvm2/files/lvm.confd-2.02.28-r2 |
76 |
deleted file mode 100644 |
77 |
index 2fbd8668c37..00000000000 |
78 |
--- a/sys-fs/lvm2/files/lvm.confd-2.02.28-r2 |
79 |
+++ /dev/null |
80 |
@@ -1,5 +0,0 @@ |
81 |
-# LVM should normally only be started after mdraid is available |
82 |
-# this is because LVM physical volumes are very often MD devices. |
83 |
-RC_AFTER="mdraid" |
84 |
- |
85 |
-# vim: ft=gentoo-conf-d |
86 |
|
87 |
diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.105-r2 b/sys-fs/lvm2/files/lvm.rc-2.02.105-r2 |
88 |
deleted file mode 100644 |
89 |
index 937db047d19..00000000000 |
90 |
--- a/sys-fs/lvm2/files/lvm.rc-2.02.105-r2 |
91 |
+++ /dev/null |
92 |
@@ -1,96 +0,0 @@ |
93 |
-#!/sbin/openrc-run |
94 |
-# Copyright 1999-2019 Gentoo Authors |
95 |
-# Distributed under the terms of the GNU General Public License v2 |
96 |
- |
97 |
-depend() { |
98 |
- before checkfs fsck |
99 |
- after modules device-mapper |
100 |
- need lvmetad sysfs |
101 |
-} |
102 |
- |
103 |
-config='global { locking_dir = "/run/lock/lvm" }' |
104 |
- |
105 |
-dm_in_proc() { |
106 |
- local retval=0 |
107 |
- for x in devices misc ; do |
108 |
- grep -qs 'device-mapper' /proc/${x} |
109 |
- retval=$((${retval} + $?)) |
110 |
- done |
111 |
- return ${retval} |
112 |
-} |
113 |
- |
114 |
-start() { |
115 |
- # LVM support for /usr, /home, /opt .... |
116 |
- # This should be done *before* checking local |
117 |
- # volumes, or they never get checked. |
118 |
- |
119 |
- # NOTE: Add needed modules for LVM or RAID, etc |
120 |
- # to /etc/modules.autoload if needed |
121 |
- for lvm_path in /bin/lvm /sbin/lvm ; do |
122 |
- [ -x "$lvm_path" ] && break |
123 |
- done |
124 |
- if [ ! -x "$lvm_path" ]; then |
125 |
- eerror "Cannot find lvm binary in /sbin or /bin!" |
126 |
- return 1 |
127 |
- fi |
128 |
- if [ -z "${CDBOOT}" ] ; then |
129 |
- if [ -e /proc/modules ] && ! dm_in_proc ; then |
130 |
- modprobe dm-mod 2>/dev/null |
131 |
- fi |
132 |
- if [ -d /proc/lvm ] || dm_in_proc ; then |
133 |
- ebegin "Setting up the Logical Volume Manager" |
134 |
- #still echo stderr for debugging |
135 |
- lvm_commands="#! ${lvm_path} --config '${config}'\n" |
136 |
- # Extra PV find pass because some devices might not have been available until very recently |
137 |
- lvm_commands="${lvm_commands}pvscan\n" |
138 |
- # Now make the nodes |
139 |
- lvm_commands="${lvm_commands}vgscan --mknodes\n" |
140 |
- # And turn them on! |
141 |
- lvm_commands="${lvm_commands}vgchange --sysinit -a ly\n" |
142 |
- # Order of this is important, have to work around dash and LVM readline |
143 |
- printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null |
144 |
- eend $? "Failed to setup the LVM" |
145 |
- fi |
146 |
- fi |
147 |
-} |
148 |
- |
149 |
-stop() { |
150 |
- for lvm_path in /bin/lvm /sbin/lvm ; do |
151 |
- [ -x "$lvm_path" ] && break |
152 |
- done |
153 |
- if [ ! -x "$lvm_path" ]; then |
154 |
- eerror "Cannot find lvm binary in /sbin or /bin!" |
155 |
- return 1 |
156 |
- fi |
157 |
-# Stop LVM2 |
158 |
-if [ -x /sbin/vgs ] && \ |
159 |
- [ -x /sbin/vgchange ] && \ |
160 |
- [ -x /sbin/lvchange ] && \ |
161 |
- [ -f /etc/lvmtab -o -d /etc/lvm ] && \ |
162 |
- [ -d /proc/lvm -o "`grep device-mapper /proc/misc 2>/dev/null`" ] |
163 |
-then |
164 |
- einfo "Shutting down the Logical Volume Manager" |
165 |
- |
166 |
- |
167 |
- VGS=$($lvm_path vgs --config "${config}" -o vg_name --noheadings --nosuffix --rows 2> /dev/null) |
168 |
- |
169 |
- if [ "$VGS" ] |
170 |
- then |
171 |
- ebegin " Shutting Down LVs & VGs" |
172 |
- #still echo stderr for debugging |
173 |
- lvm_commands="#! ${lvm_path} --config '${config}'\n" |
174 |
- # Extra PV find pass because some devices might not have been available until very recently |
175 |
- lvm_commands="${lvm_commands}lvchange --sysinit -a ln ${VGS}\n" |
176 |
- # Now make the nodes |
177 |
- lvm_commands="${lvm_commands}vgchange --sysinit -a ln ${VGS}\n" |
178 |
- # Order of this is important, have to work around dash and LVM readline |
179 |
- printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null |
180 |
- eend $? "Failed (possibly some LVs still needed for /usr or root)" |
181 |
- fi |
182 |
- |
183 |
- einfo "Finished shutting down the Logical Volume Manager" |
184 |
- return 0 |
185 |
-fi |
186 |
-} |
187 |
- |
188 |
-# vim:ts=4 |
189 |
|
190 |
diff --git a/sys-fs/lvm2/files/lvm2-2.02.106-pthread-pkgconfig.patch b/sys-fs/lvm2/files/lvm2-2.02.106-pthread-pkgconfig.patch |
191 |
deleted file mode 100644 |
192 |
index 594d6061725..00000000000 |
193 |
--- a/sys-fs/lvm2/files/lvm2-2.02.106-pthread-pkgconfig.patch |
194 |
+++ /dev/null |
195 |
@@ -1,32 +0,0 @@ |
196 |
-Make sure that libdm usage always brings in pthread libraries, both in |
197 |
-pkgconfig and during manual build. |
198 |
- |
199 |
---- tools/Makefile.in |
200 |
-+++ tools/Makefile.in |
201 |
-@@ -87,6 +87,7 @@ |
202 |
- INSTALL_LVM_TARGETS += install_tools_static |
203 |
- INSTALL_DMSETUP_TARGETS += install_dmsetup_static |
204 |
- INSTALL_CMDLIB_TARGETS += install_cmdlib_static |
205 |
-+ STATIC_LIBS += @PTHREAD_LIBS@ |
206 |
- endif |
207 |
- |
208 |
- LVMLIBS = $(LVMINTERNAL_LIBS) |
209 |
-@@ -118,6 +119,10 @@ |
210 |
- |
211 |
- include $(top_builddir)/make.tmpl |
212 |
- |
213 |
-+ifeq ("@STATIC_LINK@", "yes") |
214 |
-+ STATIC_LIBS += @PTHREAD_LIBS@ |
215 |
-+endif |
216 |
-+ |
217 |
- device-mapper: $(TARGETS_DM) |
218 |
- |
219 |
- CFLAGS_dmsetup.o += $(UDEV_CFLAGS) $(EXTRA_EXEC_CFLAGS) |
220 |
---- libdm/libdevmapper.pc.in |
221 |
-+++ libdm/libdevmapper.pc.in |
222 |
-@@ -8,4 +8,5 @@ |
223 |
- Version: @DM_LIB_PATCHLEVEL@ |
224 |
- Cflags: -I${includedir} |
225 |
- Libs: -L${libdir} -ldevmapper |
226 |
-+Libs.private: -L${libdir} @PTHREAD_LIBS@ |
227 |
- Requires.private: @SELINUX_PC@ @UDEV_PC@ |
228 |
|
229 |
diff --git a/sys-fs/lvm2/files/lvm2-2.02.108-example.conf.in.patch b/sys-fs/lvm2/files/lvm2-2.02.108-example.conf.in.patch |
230 |
deleted file mode 100644 |
231 |
index af5a5afe258..00000000000 |
232 |
--- a/sys-fs/lvm2/files/lvm2-2.02.108-example.conf.in.patch |
233 |
+++ /dev/null |
234 |
@@ -1,50 +0,0 @@ |
235 |
-Maintainer note: Forward ported without editing from lvm2-2.02.99-example.conf.in.patch to apply cleanly. |
236 |
- |
237 |
---- conf/example.conf.in |
238 |
-+++ conf/example.conf.in |
239 |
-@@ -105,6 +105,10 @@ |
240 |
- # By default we accept every block device: |
241 |
- # filter = [ "a/.*/" ] |
242 |
- |
243 |
-+ # Gentoo: we exclude /dev/nbd by default, because it makes a lot of kernel |
244 |
-+ # noise when you probed while not available. |
245 |
-+ filter = [ "r|/dev/nbd.*|", "a/.*/" ] |
246 |
-+ |
247 |
- # Exclude the cdrom drive |
248 |
- # filter = [ "r|/dev/cdrom|" ] |
249 |
- |
250 |
-@@ -522,7 +526,8 @@ |
251 |
- # e.g. vgscan.lvm1 and they will stop working after you start using |
252 |
- # the new lvm2 on-disk metadata format. |
253 |
- # The default value is set when the tools are built. |
254 |
-- # fallback_to_lvm1 = 0 |
255 |
-+ # Gentoo: the LVM tools are a seperate package. |
256 |
-+ fallback_to_lvm1 = 0 |
257 |
- |
258 |
- # The default metadata format that commands should use - "lvm1" or "lvm2". |
259 |
- # The command line override is -M1 or -M2. |
260 |
-@@ -1182,12 +1187,13 @@ |
261 |
- |
262 |
- # Metadata settings |
263 |
- # |
264 |
--# metadata { |
265 |
-+metadata { |
266 |
- # Default number of copies of metadata to hold on each PV. 0, 1 or 2. |
267 |
- # You might want to override it from the command line with 0 |
268 |
- # when running pvcreate on new PVs which are to be added to large VGs. |
269 |
- |
270 |
-- # pvmetadatacopies = 1 |
271 |
-+ # Gentoo: enable for data safety, but PV resize is then disabled. |
272 |
-+ # pvmetadatacopies = 2 |
273 |
- |
274 |
- # Default number of copies of metadata to maintain for each VG. |
275 |
- # If set to a non-zero value, LVM automatically chooses which of |
276 |
-@@ -1222,7 +1228,7 @@ |
277 |
- # the supplied toolset to make changes (e.g. vgcfgrestore). |
278 |
- |
279 |
- # dirs = [ "/etc/lvm/metadata", "/mnt/disk2/lvm/metadata2" ] |
280 |
--#} |
281 |
-+} |
282 |
- |
283 |
- # Event daemon |
284 |
- # |
285 |
|
286 |
diff --git a/sys-fs/lvm2/files/lvm2-2.02.108-static-pkgconfig-libs.patch b/sys-fs/lvm2/files/lvm2-2.02.108-static-pkgconfig-libs.patch |
287 |
deleted file mode 100644 |
288 |
index 3ab699868a5..00000000000 |
289 |
--- a/sys-fs/lvm2/files/lvm2-2.02.108-static-pkgconfig-libs.patch |
290 |
+++ /dev/null |
291 |
@@ -1,104 +0,0 @@ |
292 |
-Maintainer note: Forward ported without editing from lvm2-2.02.107-static-pkgconfig-libs.patch to apply cleanly. |
293 |
- |
294 |
---- configure.in |
295 |
-+++ configure.in |
296 |
-@@ -1067,6 +1067,7 @@ |
297 |
- fi]) |
298 |
- if test "$BLKID_WIPING" = yes; then |
299 |
- BLKID_PC="blkid" |
300 |
-+ BLKID_STATIC_LIBS=`$PKG_CONFIG --static --libs $BLKID_PC` |
301 |
- AC_DEFINE([BLKID_WIPING_SUPPORT], 1, [Define to 1 to use libblkid detection of signatures when wiping.]) |
302 |
- fi |
303 |
- fi |
304 |
-@@ -1092,6 +1093,7 @@ |
305 |
- if test "$UDEV_SYNC" = yes; then |
306 |
- pkg_config_init |
307 |
- PKG_CHECK_MODULES(UDEV, libudev >= 143, [UDEV_PC="libudev"]) |
308 |
-+ UDEV_STATIC_LIBS=`$PKG_CONFIG --static --libs libudev` |
309 |
- AC_DEFINE([UDEV_SYNC_SUPPORT], 1, [Define to 1 to enable synchronisation with udev processing.]) |
310 |
- fi |
311 |
- |
312 |
-@@ -1312,19 +1314,32 @@ |
313 |
- if test "$SELINUX" = yes; then |
314 |
- AC_CHECK_LIB([sepol], [sepol_check_context], [ |
315 |
- AC_DEFINE([HAVE_SEPOL], 1, [Define to 1 if sepol_check_context is available.]) |
316 |
-- SELINUX_LIBS="-lsepol"]) |
317 |
-+ SEPOL_LIBS="-lsepol"]) |
318 |
-+ |
319 |
-+ dnl -- init pkgconfig if required |
320 |
-+ if test x$PKGCONFIG_INIT != x1; then |
321 |
-+ pkg_config_init |
322 |
-+ fi |
323 |
-+ PKG_CHECK_MODULES(SELINUX, libselinux, [ |
324 |
-+ SELINUX_PC="libselinux" |
325 |
-+ SELINUX_STATIC_LIBS=`$PKG_CONFIG --static --libs libselinux` |
326 |
-+ SELINUX_LIBS="$SELINUX_LIBS $SEPOL_LIBS" |
327 |
-+ AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.]) |
328 |
-+ ],[ |
329 |
-+ dnl -- old non-pkgconfig method, is buggy with static builds |
330 |
- |
331 |
- AC_CHECK_LIB([selinux], [is_selinux_enabled], [ |
332 |
- AC_CHECK_HEADERS([selinux/selinux.h],, hard_bailout) |
333 |
- AC_CHECK_HEADERS([selinux/label.h]) |
334 |
- AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.]) |
335 |
-- SELINUX_LIBS="-lselinux $SELINUX_LIBS" |
336 |
-+ SELINUX_LIBS="-lselinux $SEPOL_LIBS" |
337 |
- SELINUX_PC="libselinux" |
338 |
- HAVE_SELINUX=yes ], [ |
339 |
- AC_MSG_WARN(Disabling selinux) |
340 |
- SELINUX_LIBS= |
341 |
- SELINUX_PC= |
342 |
- HAVE_SELINUX=no ]) |
343 |
-+ ]) |
344 |
- fi |
345 |
- |
346 |
- ################################################################################ |
347 |
-@@ -1626,6 +1641,7 @@ |
348 |
- ################################################################################ |
349 |
- AC_SUBST(APPLIB) |
350 |
- AC_SUBST(AWK) |
351 |
-+AC_SUBST(BLKID_STATIC_LIBS) |
352 |
- AC_SUBST(BLKID_PC) |
353 |
- AC_SUBST(BLKID_WIPING) |
354 |
- AC_SUBST(BUILD_CMIRRORD) |
355 |
-@@ -1721,6 +1737,7 @@ |
356 |
- AC_SUBST(SALCK_CFLAGS) |
357 |
- AC_SUBST(SALCK_LIBS) |
358 |
- AC_SUBST(SELINUX_LIBS) |
359 |
-+AC_SUBST(SELINUX_STATIC_LIBS) |
360 |
- AC_SUBST(SELINUX_PC) |
361 |
- AC_SUBST(SNAPSHOTS) |
362 |
- AC_SUBST(STATICDIR) |
363 |
-@@ -1735,6 +1752,7 @@ |
364 |
- AC_SUBST(CACHE_DUMP_CMD) |
365 |
- AC_SUBST(CACHE_REPAIR_CMD) |
366 |
- AC_SUBST(CACHE_RESTORE_CMD) |
367 |
-+AC_SUBST(UDEV_STATIC_LIBS) |
368 |
- AC_SUBST(UDEV_PC) |
369 |
- AC_SUBST(UDEV_RULES) |
370 |
- AC_SUBST(UDEV_SYNC) |
371 |
---- make.tmpl.in |
372 |
-+++ make.tmpl.in |
373 |
-@@ -43,7 +43,7 @@ |
374 |
- |
375 |
- LIBS = @LIBS@ |
376 |
- # Extra libraries always linked with static binaries |
377 |
--STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) |
378 |
-+STATIC_LIBS = $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS) $(BLKID_STATIC_LIBS) |
379 |
- DEFS += @DEFS@ |
380 |
- # FIXME set this only where it's needed, not globally? |
381 |
- CFLAGS += @CFLAGS@ |
382 |
-@@ -57,10 +57,13 @@ |
383 |
- PTHREAD_LIBS = @PTHREAD_LIBS@ |
384 |
- READLINE_LIBS = @READLINE_LIBS@ |
385 |
- SELINUX_LIBS = @SELINUX_LIBS@ |
386 |
-+SELINUX_STATIC_LIBS = @SELINUX_STATIC_LIBS@ |
387 |
- UDEV_CFLAGS = @UDEV_CFLAGS@ |
388 |
- UDEV_LIBS = @UDEV_LIBS@ |
389 |
-+UDEV_STATIC_LIBS = @UDEV_STATIC_LIBS@ |
390 |
- BLKID_CFLAGS = @BLKID_CFLAGS@ |
391 |
- BLKID_LIBS = @BLKID_LIBS@ |
392 |
-+BLKID_STATIC_LIBS = @BLKID_STATIC_LIBS@ |
393 |
- TESTING = @TESTING@ |
394 |
- |
395 |
- # Setup directory variables |
396 |
|
397 |
diff --git a/sys-fs/lvm2/files/lvm2-2.02.129-example.conf.in.patch b/sys-fs/lvm2/files/lvm2-2.02.129-example.conf.in.patch |
398 |
deleted file mode 100644 |
399 |
index 076e06080ca..00000000000 |
400 |
--- a/sys-fs/lvm2/files/lvm2-2.02.129-example.conf.in.patch |
401 |
+++ /dev/null |
402 |
@@ -1,52 +0,0 @@ |
403 |
-Maintainer note: Forward ported without editing from lvm2-2.02.108-example.conf.in.patch to apply cleanly. |
404 |
- |
405 |
---- LVM2.2.02.129/conf/example.conf.in |
406 |
-+++ LVM2.2.02.129/conf/example.conf.in |
407 |
-@@ -128,6 +128,9 @@ |
408 |
- # Example |
409 |
- # Accept every block device: |
410 |
- # filter = [ "a|.*/|" ] |
411 |
-+ # Gentoo: we exclude /dev/nbd by default, because it makes a lot of kernel |
412 |
-+ # noise when you probed while not available. |
413 |
-+ filter = [ "r|/dev/nbd.*|", "a/.*/" ] |
414 |
- # Reject the cdrom drive: |
415 |
- # filter = [ "r|/dev/cdrom|" ] |
416 |
- # Work with just loopback devices, e.g. for testing: |
417 |
-@@ -620,7 +623,8 @@ |
418 |
- # tools need to be installed with .lvm1 suffices, e.g. vgscan.lvm1. |
419 |
- # They will stop working once the lvm2 on-disk metadata format is used. |
420 |
- # This configuration option has an automatic default value. |
421 |
-- # fallback_to_lvm1 = @DEFAULT_FALLBACK_TO_LVM1@ |
422 |
-+ # Gentoo: the LVM tools are a seperate package. |
423 |
-+ fallback_to_lvm1 = 0 |
424 |
- |
425 |
- # Configuration option global/format. |
426 |
- # The default metadata format that commands should use. |
427 |
-@@ -1413,7 +1417,7 @@ |
428 |
- |
429 |
- # Configuration section metadata. |
430 |
- # This configuration section has an automatic default value. |
431 |
--# metadata { |
432 |
-+metadata { |
433 |
- |
434 |
- # Configuration option metadata/pvmetadatacopies. |
435 |
- # Number of copies of metadata to store on each PV. |
436 |
-@@ -1431,7 +1435,8 @@ |
437 |
- # |
438 |
- # This configuration option is advanced. |
439 |
- # This configuration option has an automatic default value. |
440 |
-- # pvmetadatacopies = 1 |
441 |
-+ # Gentoo: enable for data safety, but PV resize is then disabled. |
442 |
-+ # pvmetadatacopies = 2 |
443 |
- |
444 |
- # Configuration option metadata/vgmetadatacopies. |
445 |
- # Number of copies of metadata to maintain for each VG. |
446 |
-@@ -1486,7 +1491,7 @@ |
447 |
- # |
448 |
- # This configuration option is advanced. |
449 |
- # This configuration option does not have a default value defined. |
450 |
--# } |
451 |
-+} |
452 |
- |
453 |
- # Configuration section report. |
454 |
- # LVM report command output formatting. |
455 |
|
456 |
diff --git a/sys-fs/lvm2/files/lvm2-2.02.129-static-pkgconfig-libs.patch b/sys-fs/lvm2/files/lvm2-2.02.129-static-pkgconfig-libs.patch |
457 |
deleted file mode 100644 |
458 |
index 239694523b3..00000000000 |
459 |
--- a/sys-fs/lvm2/files/lvm2-2.02.129-static-pkgconfig-libs.patch |
460 |
+++ /dev/null |
461 |
@@ -1,102 +0,0 @@ |
462 |
---- LVM2.2.02.129/configure.in |
463 |
-+++ LVM2.2.02.129/configure.in |
464 |
-@@ -1287,6 +1287,7 @@ |
465 |
- fi]) |
466 |
- if test "$BLKID_WIPING" = yes; then |
467 |
- BLKID_PC="blkid" |
468 |
-+ BLKID_STATIC_LIBS=`$PKG_CONFIG --static --libs $BLKID_PC` |
469 |
- DEFAULT_USE_BLKID_WIPING=1 |
470 |
- AC_DEFINE([BLKID_WIPING_SUPPORT], 1, [Define to 1 to use libblkid detection of signatures when wiping.]) |
471 |
- else |
472 |
-@@ -1332,6 +1333,7 @@ |
473 |
- if test "$UDEV_SYNC" = yes; then |
474 |
- pkg_config_init |
475 |
- PKG_CHECK_MODULES(UDEV, libudev >= 143, [UDEV_PC="libudev"]) |
476 |
-+ UDEV_STATIC_LIBS=`$PKG_CONFIG --static --libs libudev` |
477 |
- AC_DEFINE([UDEV_SYNC_SUPPORT], 1, [Define to 1 to enable synchronisation with udev processing.]) |
478 |
- fi |
479 |
- |
480 |
-@@ -1558,19 +1560,32 @@ |
481 |
- if test "$SELINUX" = yes; then |
482 |
- AC_CHECK_LIB([sepol], [sepol_check_context], [ |
483 |
- AC_DEFINE([HAVE_SEPOL], 1, [Define to 1 if sepol_check_context is available.]) |
484 |
-- SELINUX_LIBS="-lsepol"]) |
485 |
-+ SEPOL_LIBS="-lsepol"]) |
486 |
-+ |
487 |
-+ dnl -- init pkgconfig if required |
488 |
-+ if test x$PKGCONFIG_INIT != x1; then |
489 |
-+ pkg_config_init |
490 |
-+ fi |
491 |
-+ PKG_CHECK_MODULES(SELINUX, libselinux, [ |
492 |
-+ SELINUX_PC="libselinux" |
493 |
-+ SELINUX_STATIC_LIBS=`$PKG_CONFIG --static --libs libselinux` |
494 |
-+ SELINUX_LIBS="$SELINUX_LIBS $SEPOL_LIBS" |
495 |
-+ AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.]) |
496 |
-+ ],[ |
497 |
-+ dnl -- old non-pkgconfig method, is buggy with static builds |
498 |
- |
499 |
- AC_CHECK_LIB([selinux], [is_selinux_enabled], [ |
500 |
- AC_CHECK_HEADERS([selinux/selinux.h],, hard_bailout) |
501 |
- AC_CHECK_HEADERS([selinux/label.h]) |
502 |
- AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.]) |
503 |
-- SELINUX_LIBS="-lselinux $SELINUX_LIBS" |
504 |
-+ SELINUX_LIBS="-lselinux $SEPOL_LIBS" |
505 |
- SELINUX_PC="libselinux" |
506 |
- HAVE_SELINUX=yes ], [ |
507 |
- AC_MSG_WARN(Disabling selinux) |
508 |
- SELINUX_LIBS= |
509 |
- SELINUX_PC= |
510 |
- HAVE_SELINUX=no ]) |
511 |
-+ ]) |
512 |
- fi |
513 |
- |
514 |
- ################################################################################ |
515 |
-@@ -1902,6 +1917,7 @@ |
516 |
- ################################################################################ |
517 |
- AC_SUBST(APPLIB) |
518 |
- AC_SUBST(AWK) |
519 |
-+AC_SUBST(BLKID_STATIC_LIBS) |
520 |
- AC_SUBST(BLKID_PC) |
521 |
- AC_SUBST(BUILD_CMIRRORD) |
522 |
- AC_SUBST(BUILD_DMEVENTD) |
523 |
-@@ -2005,6 +2021,7 @@ |
524 |
- AC_SUBST(SALCK_CFLAGS) |
525 |
- AC_SUBST(SALCK_LIBS) |
526 |
- AC_SUBST(SELINUX_LIBS) |
527 |
-+AC_SUBST(SELINUX_STATIC_LIBS) |
528 |
- AC_SUBST(SELINUX_PC) |
529 |
- AC_SUBST(SNAPSHOTS) |
530 |
- AC_SUBST(STATICDIR) |
531 |
-@@ -2020,6 +2037,7 @@ |
532 |
- AC_SUBST(CACHE_DUMP_CMD) |
533 |
- AC_SUBST(CACHE_REPAIR_CMD) |
534 |
- AC_SUBST(CACHE_RESTORE_CMD) |
535 |
-+AC_SUBST(UDEV_STATIC_LIBS) |
536 |
- AC_SUBST(UDEV_PC) |
537 |
- AC_SUBST(UDEV_RULES) |
538 |
- AC_SUBST(UDEV_SYNC) |
539 |
---- LVM2.2.02.129/make.tmpl.in |
540 |
-+++ LVM2.2.02.129/make.tmpl.in |
541 |
-@@ -43,7 +43,7 @@ |
542 |
- |
543 |
- LIBS = @LIBS@ |
544 |
- # Extra libraries always linked with static binaries |
545 |
--STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS) |
546 |
-+STATIC_LIBS = $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS) $(BLKID_STATIC_LIBS) |
547 |
- DEFS += @DEFS@ |
548 |
- # FIXME set this only where it's needed, not globally? |
549 |
- CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@ |
550 |
-@@ -58,10 +58,13 @@ |
551 |
- PTHREAD_LIBS = @PTHREAD_LIBS@ |
552 |
- READLINE_LIBS = @READLINE_LIBS@ |
553 |
- SELINUX_LIBS = @SELINUX_LIBS@ |
554 |
-+SELINUX_STATIC_LIBS = @SELINUX_STATIC_LIBS@ |
555 |
- UDEV_CFLAGS = @UDEV_CFLAGS@ |
556 |
- UDEV_LIBS = @UDEV_LIBS@ |
557 |
-+UDEV_STATIC_LIBS = @UDEV_STATIC_LIBS@ |
558 |
- BLKID_CFLAGS = @BLKID_CFLAGS@ |
559 |
- BLKID_LIBS = @BLKID_LIBS@ |
560 |
-+BLKID_STATIC_LIBS = @BLKID_STATIC_LIBS@ |
561 |
- VALGRIND_CFLAGS = @VALGRIND_CFLAGS@ |
562 |
- TESTING = @TESTING@ |
563 |
- |
564 |
|
565 |
diff --git a/sys-fs/lvm2/files/lvm2-2.02.130-pthread-pkgconfig.patch b/sys-fs/lvm2/files/lvm2-2.02.130-pthread-pkgconfig.patch |
566 |
deleted file mode 100644 |
567 |
index 11db632e2e7..00000000000 |
568 |
--- a/sys-fs/lvm2/files/lvm2-2.02.130-pthread-pkgconfig.patch |
569 |
+++ /dev/null |
570 |
@@ -1,32 +0,0 @@ |
571 |
-Make sure that libdm usage always brings in pthread libraries, both in |
572 |
-pkgconfig and during manual build. |
573 |
- |
574 |
---- LVM2.2.02.130/libdm/libdevmapper.pc.in |
575 |
-+++ LVM2.2.02.130/libdm/libdevmapper.pc.in |
576 |
-@@ -9,4 +9,4 @@ |
577 |
- Cflags: -I${includedir} |
578 |
- Libs: -L${libdir} -ldevmapper |
579 |
- Requires.private: @SELINUX_PC@ @UDEV_PC@ |
580 |
--Libs.private: -lm @RT_LIB@ |
581 |
-+Libs.private: -lm @RT_LIB@ @PTHREAD_LIBS@ |
582 |
---- LVM2.2.02.130/tools/Makefile.in |
583 |
-+++ LVM2.2.02.130/tools/Makefile.in |
584 |
-@@ -90,6 +90,7 @@ |
585 |
- INSTALL_LVM_TARGETS += install_tools_static |
586 |
- INSTALL_DMSETUP_TARGETS += install_dmsetup_static |
587 |
- INSTALL_CMDLIB_TARGETS += install_cmdlib_static |
588 |
-+ STATIC_LIBS += @PTHREAD_LIBS@ |
589 |
- endif |
590 |
- |
591 |
- LVMLIBS = $(LVMINTERNAL_LIBS) |
592 |
-@@ -120,6 +121,10 @@ |
593 |
- |
594 |
- include $(top_builddir)/make.tmpl |
595 |
- |
596 |
-+ifeq ("@STATIC_LINK@", "yes") |
597 |
-+ STATIC_LIBS += @PTHREAD_LIBS@ |
598 |
-+endif |
599 |
-+ |
600 |
- device-mapper: $(TARGETS_DM) |
601 |
- |
602 |
- CFLAGS_dmsetup.o += $(UDEV_CFLAGS) $(EXTRA_EXEC_CFLAGS) |
603 |
|
604 |
diff --git a/sys-fs/lvm2/files/lvm2-2.02.139-dynamic-static-ldflags.patch b/sys-fs/lvm2/files/lvm2-2.02.139-dynamic-static-ldflags.patch |
605 |
deleted file mode 100644 |
606 |
index 312e546e240..00000000000 |
607 |
--- a/sys-fs/lvm2/files/lvm2-2.02.139-dynamic-static-ldflags.patch |
608 |
+++ /dev/null |
609 |
@@ -1,63 +0,0 @@ |
610 |
-diff -ur LVM2.2.02.139_O/configure.in LVM2.2.02.139/configure.in |
611 |
---- LVM2.2.02.139_O/configure.in 2016-01-19 12:54:33.155187005 +0000 |
612 |
-+++ LVM2.2.02.139/configure.in 2016-01-19 12:56:39.487181372 +0000 |
613 |
-@@ -31,6 +31,7 @@ |
614 |
- linux*) |
615 |
- CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym" |
616 |
- ELDFLAGS="-Wl,--export-dynamic" |
617 |
-+ STATIC_LDFLAGS="-Wl,--no-export-dynamic" |
618 |
- # FIXME Generate list and use --dynamic-list=.dlopen.sym |
619 |
- CLDWHOLEARCHIVE="-Wl,-whole-archive" |
620 |
- CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive" |
621 |
-@@ -2009,6 +2010,7 @@ |
622 |
- AC_SUBST(SELINUX_PC) |
623 |
- AC_SUBST(SNAPSHOTS) |
624 |
- AC_SUBST(STATICDIR) |
625 |
-+AC_SUBST(STATIC_LDFLAGS) |
626 |
- AC_SUBST(STATIC_LINK) |
627 |
- AC_SUBST(TESTING) |
628 |
- AC_SUBST(TESTSUITE_DATA) |
629 |
-diff -ur LVM2.2.02.139_O/daemons/dmeventd/Makefile.in LVM2.2.02.139/daemons/dmeventd/Makefile.in |
630 |
---- LVM2.2.02.139_O/daemons/dmeventd/Makefile.in 2016-01-19 12:54:33.278186999 +0000 |
631 |
-+++ LVM2.2.02.139/daemons/dmeventd/Makefile.in 2016-01-19 12:57:44.277178484 +0000 |
632 |
-@@ -67,7 +67,7 @@ |
633 |
- $(DL_LIBS) $(LVMLIBS) $(LIBS) -rdynamic |
634 |
- |
635 |
- dmeventd.static: $(LIB_STATIC) dmeventd.o $(interfacebuilddir)/libdevmapper.a |
636 |
-- $(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \ |
637 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(ELDFLAGS) $(STATIC_LDFLAGS) -static -L. -L$(interfacebuilddir) -o $@ \ |
638 |
- dmeventd.o $(DL_LIBS) $(LVMLIBS) $(LIBS) $(STATIC_LIBS) |
639 |
- |
640 |
- ifeq ("@PKGCONFIG@", "yes") |
641 |
-diff -ur LVM2.2.02.139_O/make.tmpl.in LVM2.2.02.139/make.tmpl.in |
642 |
---- LVM2.2.02.139_O/make.tmpl.in 2016-01-19 12:54:33.529186988 +0000 |
643 |
-+++ LVM2.2.02.139/make.tmpl.in 2016-01-19 12:58:31.514176378 +0000 |
644 |
-@@ -49,6 +49,7 @@ |
645 |
- # FIXME set this only where it's needed, not globally? |
646 |
- CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@ |
647 |
- LDFLAGS ?= @COPTIMISE_FLAG@ @LDFLAGS@ |
648 |
-+STATIC_LDFLAGS += @STATIC_LDFLAGS@ |
649 |
- CLDFLAGS += @CLDFLAGS@ |
650 |
- ELDFLAGS += @ELDFLAGS@ |
651 |
- LDDEPS += @LDDEPS@ |
652 |
-diff -ur LVM2.2.02.139_O/tools/Makefile.in LVM2.2.02.139/tools/Makefile.in |
653 |
---- LVM2.2.02.139_O/tools/Makefile.in 2016-01-08 18:51:21.000000000 +0000 |
654 |
-+++ LVM2.2.02.139/tools/Makefile.in 2016-01-19 13:00:08.349172060 +0000 |
655 |
-@@ -129,7 +129,7 @@ |
656 |
- -o $@ dmsetup.o -ldevmapper $(LIBS) |
657 |
- |
658 |
- dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a |
659 |
-- $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \ |
660 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L$(interfacebuilddir) \ |
661 |
- -o $@ dmsetup.o -ldevmapper $(M_LIBS) $(PTHREAD_LIBS) $(STATIC_LIBS) $(LIBS) |
662 |
- |
663 |
- all: device-mapper |
664 |
-@@ -146,7 +146,7 @@ |
665 |
- endif |
666 |
- |
667 |
- lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a $(interfacebuilddir)/libdevmapper.a |
668 |
-- $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \ |
669 |
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L$(interfacebuilddir) -o $@ \ |
670 |
- $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS) |
671 |
- |
672 |
- liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o |
673 |
|
674 |
diff --git a/sys-fs/lvm2/files/lvm2-2.02.145-mkdev.patch b/sys-fs/lvm2/files/lvm2-2.02.145-mkdev.patch |
675 |
deleted file mode 100644 |
676 |
index f91dccd5c18..00000000000 |
677 |
--- a/sys-fs/lvm2/files/lvm2-2.02.145-mkdev.patch |
678 |
+++ /dev/null |
679 |
@@ -1,127 +0,0 @@ |
680 |
-https://bugs.gentoo.org/580062 |
681 |
- |
682 |
-From 2a1d0fa8ea765604cd8274aac5aa7876f1c145c9 Mon Sep 17 00:00:00 2001 |
683 |
-From: Mike Frysinger <vapier@g.o> |
684 |
-Date: Tue, 19 Apr 2016 23:53:22 -0400 |
685 |
-Subject: [PATCH] convert major/minor/makedev handling |
686 |
- |
687 |
-Most of the files in here use MAJOR/MINOR/MKDEV macros, but a few |
688 |
-missed it. Update the defines in those files to match them. |
689 |
---- |
690 |
- daemons/cmirrord/functions.c | 16 ++++++++++++---- |
691 |
- daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c | 12 ++++++++++-- |
692 |
- lib/filters/filter-sysfs.c | 6 ++++-- |
693 |
- 3 files changed, 26 insertions(+), 8 deletions(-) |
694 |
- |
695 |
-diff --git a/daemons/cmirrord/functions.c b/daemons/cmirrord/functions.c |
696 |
-index e9d3c09..5b3cb38 100644 |
697 |
---- a/daemons/cmirrord/functions.c |
698 |
-+++ b/daemons/cmirrord/functions.c |
699 |
-@@ -20,6 +20,14 @@ |
700 |
- #include <time.h> |
701 |
- #include <unistd.h> |
702 |
- |
703 |
-+#ifdef __linux__ |
704 |
-+# include "kdev_t.h" |
705 |
-+#else |
706 |
-+# define MAJOR(x) major((x)) |
707 |
-+# define MINOR(x) minor((x)) |
708 |
-+# define MKDEV(x,y) makedev((x),(y)) |
709 |
-+#endif |
710 |
-+ |
711 |
- #define BYTE_SHIFT 3 |
712 |
- |
713 |
- /* |
714 |
-@@ -333,8 +341,8 @@ static int find_disk_path(char *major_minor_str, char *path_rtn, int *unlink_pat |
715 |
- continue; |
716 |
- } |
717 |
- if (S_ISBLK(statbuf.st_mode) && |
718 |
-- (major(statbuf.st_rdev) == major) && |
719 |
-- (minor(statbuf.st_rdev) == minor)) { |
720 |
-+ (MAJOR(statbuf.st_rdev) == major) && |
721 |
-+ (MINOR(statbuf.st_rdev) == minor)) { |
722 |
- LOG_DBG(" %s: YES", dep->d_name); |
723 |
- if (closedir(dp)) |
724 |
- LOG_DBG("Unable to closedir /dev/mapper %s", |
725 |
-@@ -1451,7 +1459,7 @@ static int disk_status_info(struct log_c *lc, struct dm_ulog_request *rq) |
726 |
- } |
727 |
- |
728 |
- r = sprintf(data, "3 clustered-disk %d:%d %c", |
729 |
-- major(statbuf.st_rdev), minor(statbuf.st_rdev), |
730 |
-+ MAJOR(statbuf.st_rdev), MINOR(statbuf.st_rdev), |
731 |
- (lc->log_dev_failed) ? 'D' : 'A'); |
732 |
- if (r < 0) |
733 |
- return r; |
734 |
-@@ -1514,7 +1522,7 @@ static int disk_status_table(struct log_c *lc, struct dm_ulog_request *rq) |
735 |
- } |
736 |
- |
737 |
- r = sprintf(data, "clustered-disk %d:%d %u %s%s ", |
738 |
-- major(statbuf.st_rdev), minor(statbuf.st_rdev), |
739 |
-+ MAJOR(statbuf.st_rdev), MINOR(statbuf.st_rdev), |
740 |
- lc->region_size, |
741 |
- (lc->sync == DEFAULTSYNC) ? "" : |
742 |
- (lc->sync == NOSYNC) ? "nosync " : "sync ", |
743 |
-diff --git a/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c b/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c |
744 |
-index 7b060ed..4098203 100644 |
745 |
---- a/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c |
746 |
-+++ b/daemons/dmeventd/plugins/snapshot/dmeventd_snapshot.c |
747 |
-@@ -20,6 +20,14 @@ |
748 |
- #include <stdarg.h> |
749 |
- #include <pthread.h> |
750 |
- |
751 |
-+#ifdef __linux__ |
752 |
-+# include "kdev_t.h" |
753 |
-+#else |
754 |
-+# define MAJOR(x) major((x)) |
755 |
-+# define MINOR(x) minor((x)) |
756 |
-+# define MKDEV(x,y) makedev((x),(y)) |
757 |
-+#endif |
758 |
-+ |
759 |
- /* First warning when snapshot is 80% full. */ |
760 |
- #define WARNING_THRESH (DM_PERCENT_1 * 80) |
761 |
- /* Run a check every 5%. */ |
762 |
-@@ -148,8 +156,8 @@ static void _umount(const char *device, int major, int minor) |
763 |
- continue; /* can't stat, skip this one */ |
764 |
- |
765 |
- if (S_ISBLK(st.st_mode) && |
766 |
-- major(st.st_rdev) == major && |
767 |
-- minor(st.st_rdev) == minor) { |
768 |
-+ MAJOR(st.st_rdev) == major && |
769 |
-+ MINOR(st.st_rdev) == minor) { |
770 |
- log_error("Unmounting invalid snapshot %s from %s.", device, words[1]); |
771 |
- if (!_run(UMOUNT_COMMAND, "-fl", words[1], NULL)) |
772 |
- log_error("Failed to umount snapshot %s from %s: %s.", |
773 |
-diff --git a/lib/filters/filter-sysfs.c b/lib/filters/filter-sysfs.c |
774 |
-index 3115f86..5f76e8b 100644 |
775 |
---- a/lib/filters/filter-sysfs.c |
776 |
-+++ b/lib/filters/filter-sysfs.c |
777 |
-@@ -19,6 +19,8 @@ |
778 |
- |
779 |
- #include <dirent.h> |
780 |
- |
781 |
-+#include "kdev_t.h" |
782 |
-+ |
783 |
- static int _locate_sysfs_blocks(const char *sysfs_dir, char *path, size_t len, |
784 |
- unsigned *sysfs_depth) |
785 |
- { |
786 |
-@@ -120,7 +122,7 @@ static struct dev_set *_dev_set_create(struct dm_pool *mem, |
787 |
- |
788 |
- static unsigned _hash_dev(dev_t dev) |
789 |
- { |
790 |
-- return (major(dev) ^ minor(dev)) & (SET_BUCKETS - 1); |
791 |
-+ return (MAJOR(dev) ^ MINOR(dev)) & (SET_BUCKETS - 1); |
792 |
- } |
793 |
- |
794 |
- /* |
795 |
-@@ -171,7 +173,7 @@ static int _parse_dev(const char *file, FILE *fp, dev_t *result) |
796 |
- return 0; |
797 |
- } |
798 |
- |
799 |
-- *result = makedev(major, minor); |
800 |
-+ *result = MKDEV(major, minor); |
801 |
- return 1; |
802 |
- } |
803 |
- |
804 |
--- |
805 |
-2.7.4 |
806 |
- |
807 |
|
808 |
diff --git a/sys-fs/lvm2/files/lvm2-2.02.70-asneeded.patch b/sys-fs/lvm2/files/lvm2-2.02.70-asneeded.patch |
809 |
deleted file mode 100644 |
810 |
index 1bae0db10c1..00000000000 |
811 |
--- a/sys-fs/lvm2/files/lvm2-2.02.70-asneeded.patch |
812 |
+++ /dev/null |
813 |
@@ -1,15 +0,0 @@ |
814 |
-http://bugs.gentoo.org/330255 |
815 |
- |
816 |
-liblvm2app.so: undefined reference to `floor' |
817 |
- |
818 |
---- LVM2/liblvm/Makefile.in |
819 |
-+++ LVM2/liblvm/Makefile.in |
820 |
-@@ -39,7 +39,7 @@ |
821 |
- |
822 |
- include $(top_builddir)/make.tmpl |
823 |
- |
824 |
--LIBS += $(LVMINTERNAL_LIBS) -ldevmapper |
825 |
-+LIBS += $(LVMINTERNAL_LIBS) -ldevmapper -lm |
826 |
- |
827 |
- ifeq ("@DMEVENTD@", "yes") |
828 |
- LIBS += -ldevmapper-event |
829 |
|
830 |
diff --git a/sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2 b/sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2 |
831 |
deleted file mode 100644 |
832 |
index 565f49c7c42..00000000000 |
833 |
--- a/sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2 |
834 |
+++ /dev/null |
835 |
@@ -1,12 +0,0 @@ |
836 |
-#!/sbin/openrc-run |
837 |
-# Copyright 1999-2019 Gentoo Authors |
838 |
-# Distributed under the terms of the GNU General Public License v2 |
839 |
- |
840 |
-pidfile="/run/lvmetad.pid" |
841 |
-command="/sbin/lvmetad" |
842 |
-command_args="${LVMETAD_OPTS:=-p ${pidfile}}" |
843 |
-start_stop_daemon_args="--pidfile ${pidfile}" |
844 |
- |
845 |
-depend() { |
846 |
- : |
847 |
-} |
848 |
|
849 |
diff --git a/sys-fs/lvm2/lvm2-2.02.116.ebuild b/sys-fs/lvm2/lvm2-2.02.116.ebuild |
850 |
deleted file mode 100644 |
851 |
index 725a5c7c841..00000000000 |
852 |
--- a/sys-fs/lvm2/lvm2-2.02.116.ebuild |
853 |
+++ /dev/null |
854 |
@@ -1,243 +0,0 @@ |
855 |
-# Copyright 1999-2020 Gentoo Authors |
856 |
-# Distributed under the terms of the GNU General Public License v2 |
857 |
- |
858 |
-EAPI=5 |
859 |
-inherit autotools eutils linux-info multilib systemd toolchain-funcs udev flag-o-matic |
860 |
- |
861 |
-DESCRIPTION="User-land utilities for LVM2 (device-mapper) software" |
862 |
-HOMEPAGE="https://sourceware.org/lvm2/" |
863 |
-SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz |
864 |
- ftp://sourceware.org/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz" |
865 |
- |
866 |
-LICENSE="GPL-2" |
867 |
-SLOT="0" |
868 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" |
869 |
-IUSE="readline static static-libs systemd lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only" |
870 |
-REQUIRED_USE="device-mapper-only? ( !lvm1 !lvm2create_initrd !thin ) |
871 |
- systemd? ( udev ) |
872 |
- static? ( !udev !systemd )" #520450 |
873 |
- |
874 |
-DEPEND_COMMON=" |
875 |
- readline? ( sys-libs/readline:0= ) |
876 |
- udev? ( >=virtual/libudev-208:=[static-libs(-)?] )" |
877 |
-# /run is now required for locking during early boot. /var cannot be assumed to |
878 |
-# be available -- thus, pull in recent enough baselayout for /run. |
879 |
-# This version of LVM is incompatible with cryptsetup <1.1.2. |
880 |
-RDEPEND="${DEPEND_COMMON} |
881 |
- >=sys-apps/baselayout-2.2 |
882 |
- !<sys-apps/openrc-0.11 |
883 |
- !<sys-fs/cryptsetup-1.1.2 |
884 |
- !!sys-fs/lvm-user |
885 |
- >=sys-apps/util-linux-2.16 |
886 |
- lvm2create_initrd? ( sys-apps/makedev ) |
887 |
- thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )" |
888 |
-# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check |
889 |
-DEPEND="${DEPEND_COMMON} |
890 |
- virtual/pkgconfig |
891 |
- >=sys-devel/binutils-2.20.1-r1 |
892 |
- static? ( |
893 |
- selinux? ( sys-libs/libselinux[static-libs] ) |
894 |
- udev? ( >=virtual/libudev-208:=[static-libs] ) |
895 |
- >=sys-apps/util-linux-2.16[static-libs] |
896 |
- )" |
897 |
- |
898 |
-S=${WORKDIR}/${PN/lvm/LVM}.${PV} |
899 |
- |
900 |
-pkg_setup() { |
901 |
- local CONFIG_CHECK="~SYSVIPC" |
902 |
- |
903 |
- if use udev; then |
904 |
- local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n" |
905 |
- if linux_config_exists; then |
906 |
- local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH) |
907 |
- if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then |
908 |
- ewarn "It's recommended to set an empty value to the following kernel config option:" |
909 |
- ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}" |
910 |
- fi |
911 |
- fi |
912 |
- fi |
913 |
- |
914 |
- check_extra_config |
915 |
- |
916 |
- # 1. Genkernel no longer copies /sbin/lvm blindly. |
917 |
- if use static; then |
918 |
- elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with" |
919 |
- elog "their static versions. If you need the static binaries," |
920 |
- elog "you must append .static to the filename!" |
921 |
- fi |
922 |
-} |
923 |
- |
924 |
-src_prepare() { |
925 |
- # Gentoo specific modification(s): |
926 |
- epatch "${FILESDIR}"/${PN}-2.02.108-example.conf.in.patch |
927 |
- |
928 |
- sed -i \ |
929 |
- -e "1iAR = $(tc-getAR)" \ |
930 |
- -e "s:CC ?= @CC@:CC = $(tc-getCC):" \ |
931 |
- make.tmpl.in || die #444082 |
932 |
- |
933 |
- sed -i -e '/FLAG/s:-O2::' configure{.in,} || die #480212 |
934 |
- |
935 |
- if use udev && ! use device-mapper-only; then |
936 |
- sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196 |
937 |
- elog "Notice that \"use_lvmetad\" setting is enabled with USE=\"udev\" in" |
938 |
- elog "/etc/lvm/lvm.conf, which will require restart of udev, lvm, and lvmetad" |
939 |
- elog "if it was previously disabled." |
940 |
- fi |
941 |
- |
942 |
- sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514 |
943 |
- |
944 |
- # For upstream -- review and forward: |
945 |
- epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch |
946 |
- epatch "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch |
947 |
- epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331 |
948 |
- epatch "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373 |
949 |
- epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed |
950 |
- epatch "${FILESDIR}"/${PN}-2.02.92-dynamic-static-ldflags.patch #332905 |
951 |
- epatch "${FILESDIR}"/${PN}-2.02.108-static-pkgconfig-libs.patch #370217, #439414 + blkid |
952 |
- epatch "${FILESDIR}"/${PN}-2.02.106-pthread-pkgconfig.patch #492450 |
953 |
- |
954 |
- # Without thin-privision-tools, there is nothing to install for target install_man7: |
955 |
- use thin || { sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die; } |
956 |
- |
957 |
- eautoreconf |
958 |
-} |
959 |
- |
960 |
-src_configure() { |
961 |
- filter-flags -flto |
962 |
- local myconf |
963 |
- local buildmode |
964 |
- |
965 |
- myconf="${myconf} $(use_enable !device-mapper-only dmeventd)" |
966 |
- myconf="${myconf} $(use_enable !device-mapper-only cmdlib)" |
967 |
- myconf="${myconf} $(use_enable !device-mapper-only applib)" |
968 |
- myconf="${myconf} $(use_enable !device-mapper-only fsadm)" |
969 |
- myconf="${myconf} $(use_enable !device-mapper-only lvmetad)" |
970 |
- use device-mapper-only && myconf="${myconf} --disable-udev-systemd-background-jobs" |
971 |
- |
972 |
- # Most of this package does weird stuff. |
973 |
- # The build options are tristate, and --without is NOT supported |
974 |
- # options: 'none', 'internal', 'shared' |
975 |
- if use static; then |
976 |
- buildmode="internal" |
977 |
- # This only causes the .static versions to become available |
978 |
- myconf="${myconf} --enable-static_link" |
979 |
- else |
980 |
- buildmode="shared" |
981 |
- fi |
982 |
- dmbuildmode=$(use !device-mapper-only && echo internal || echo none) |
983 |
- |
984 |
- # dmeventd requires mirrors to be internal, and snapshot available |
985 |
- # so we cannot disable them |
986 |
- myconf="${myconf} --with-mirrors=${dmbuildmode}" |
987 |
- myconf="${myconf} --with-snapshots=${dmbuildmode}" |
988 |
- if use thin; then |
989 |
- myconf="${myconf} --with-thin=internal --with-cache=internal" |
990 |
- local texec |
991 |
- for texec in check dump repair restore; do |
992 |
- myconf="${myconf} --with-thin-${texec}=${EPREFIX}/sbin/thin_${texec}" |
993 |
- myconf="${myconf} --with-cache-${texec}=${EPREFIX}/sbin/cache_${texec}" |
994 |
- done |
995 |
- else |
996 |
- myconf="${myconf} --with-thin=none --with-cache=none" |
997 |
- fi |
998 |
- |
999 |
- if use lvm1; then |
1000 |
- myconf="${myconf} --with-lvm1=${buildmode}" |
1001 |
- else |
1002 |
- myconf="${myconf} --with-lvm1=none" |
1003 |
- fi |
1004 |
- |
1005 |
- # disable O_DIRECT support on hppa, breaks pv detection (#99532) |
1006 |
- use hppa && myconf="${myconf} --disable-o_direct" |
1007 |
- |
1008 |
- myconf="${myconf} --with-clvmd=none --with-cluster=none" |
1009 |
- |
1010 |
- econf \ |
1011 |
- $(use_enable readline) \ |
1012 |
- $(use_enable selinux) \ |
1013 |
- --enable-pkgconfig \ |
1014 |
- --with-confdir="${EPREFIX}"/etc \ |
1015 |
- --exec-prefix="${EPREFIX}" \ |
1016 |
- --sbindir="${EPREFIX}/sbin" \ |
1017 |
- --with-staticdir="${EPREFIX}"/sbin \ |
1018 |
- --libdir="${EPREFIX}/$(get_libdir)" \ |
1019 |
- --with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \ |
1020 |
- --with-default-dm-run-dir=/run \ |
1021 |
- --with-default-run-dir=/run/lvm \ |
1022 |
- --with-default-locking-dir=/run/lock/lvm \ |
1023 |
- --with-default-pid-dir=/run \ |
1024 |
- $(use_enable udev udev_rules) \ |
1025 |
- $(use_enable udev udev_sync) \ |
1026 |
- $(use_with udev udevdir "$(get_udevdir)"/rules.d) \ |
1027 |
- $(use_enable systemd udev-systemd-background-jobs) \ |
1028 |
- "$(systemd_with_unitdir)" \ |
1029 |
- ${myconf} \ |
1030 |
- CLDFLAGS="${LDFLAGS}" |
1031 |
-} |
1032 |
- |
1033 |
-src_compile() { |
1034 |
- pushd include >/dev/null |
1035 |
- emake |
1036 |
- popd >/dev/null |
1037 |
- |
1038 |
- if use device-mapper-only ; then |
1039 |
- emake device-mapper |
1040 |
- else |
1041 |
- emake |
1042 |
- emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat |
1043 |
- fi |
1044 |
-} |
1045 |
- |
1046 |
-src_install() { |
1047 |
- local inst |
1048 |
- INSTALL_TARGETS="install install_systemd_units install_systemd_generators install_tmpfiles_configuration" |
1049 |
- use device-mapper-only && INSTALL_TARGETS="install_device-mapper" |
1050 |
- for inst in ${INSTALL_TARGETS}; do |
1051 |
- emake DESTDIR="${D}" ${inst} |
1052 |
- done |
1053 |
- |
1054 |
- newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper |
1055 |
- newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper |
1056 |
- |
1057 |
- if use !device-mapper-only ; then |
1058 |
- newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd |
1059 |
- newinitd "${FILESDIR}"/lvm.rc-2.02.105-r2 lvm |
1060 |
- newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm |
1061 |
- |
1062 |
- newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring |
1063 |
- newinitd "${FILESDIR}"/lvmetad.initd-2.02.105-r2 lvmetad |
1064 |
- fi |
1065 |
- |
1066 |
- if use static-libs; then |
1067 |
- dolib.a libdm/ioctl/libdevmapper.a |
1068 |
- dolib.a libdaemon/client/libdaemonclient.a #462908 |
1069 |
- dolib.a daemons/dmeventd/libdevmapper-event.a |
1070 |
- else |
1071 |
- rm -f "${ED}"usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a |
1072 |
- fi |
1073 |
- |
1074 |
- if use lvm2create_initrd; then |
1075 |
- dosbin scripts/lvm2create_initrd/lvm2create_initrd |
1076 |
- doman scripts/lvm2create_initrd/lvm2create_initrd.8 |
1077 |
- newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd |
1078 |
- fi |
1079 |
- |
1080 |
- insinto /etc |
1081 |
- doins "${FILESDIR}"/dmtab |
1082 |
- |
1083 |
- dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf |
1084 |
-} |
1085 |
- |
1086 |
-pkg_postinst() { |
1087 |
- ewarn "Make sure the \"lvm\" init script is in the runlevels:" |
1088 |
- ewarn "# rc-update add lvm boot" |
1089 |
- ewarn |
1090 |
- ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want" |
1091 |
- ewarn "to enable lvm autoactivation and metadata caching." |
1092 |
-} |
1093 |
- |
1094 |
-src_test() { |
1095 |
- einfo "Tests are disabled because of device-node mucking, if you want to" |
1096 |
- einfo "run tests, compile the package and see ${S}/tests" |
1097 |
-} |
1098 |
|
1099 |
diff --git a/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild |
1100 |
deleted file mode 100644 |
1101 |
index 10963e70c3d..00000000000 |
1102 |
--- a/sys-fs/lvm2/lvm2-2.02.145-r2.ebuild |
1103 |
+++ /dev/null |
1104 |
@@ -1,254 +0,0 @@ |
1105 |
-# Copyright 1999-2020 Gentoo Authors |
1106 |
-# Distributed under the terms of the GNU General Public License v2 |
1107 |
- |
1108 |
-EAPI=6 |
1109 |
-inherit autotools eutils linux-info multilib systemd toolchain-funcs udev flag-o-matic |
1110 |
- |
1111 |
-DESCRIPTION="User-land utilities for LVM2 (device-mapper) software" |
1112 |
-HOMEPAGE="https://sourceware.org/lvm2/" |
1113 |
-SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz |
1114 |
- ftp://sourceware.org/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz" |
1115 |
- |
1116 |
-LICENSE="GPL-2" |
1117 |
-SLOT="0" |
1118 |
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux" |
1119 |
-IUSE="readline static static-libs systemd lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only" |
1120 |
-REQUIRED_USE="device-mapper-only? ( !lvm1 !lvm2create_initrd !thin ) |
1121 |
- systemd? ( udev )" |
1122 |
- |
1123 |
-DEPEND_COMMON=" |
1124 |
- readline? ( sys-libs/readline:0= ) |
1125 |
- systemd? ( >=sys-apps/systemd-205:0= ) |
1126 |
- udev? ( >=virtual/libudev-208:=[static-libs(-)?] )" |
1127 |
-# /run is now required for locking during early boot. /var cannot be assumed to |
1128 |
-# be available -- thus, pull in recent enough baselayout for /run. |
1129 |
-# This version of LVM is incompatible with cryptsetup <1.1.2. |
1130 |
-RDEPEND="${DEPEND_COMMON} |
1131 |
- >=sys-apps/baselayout-2.2 |
1132 |
- !<sys-apps/openrc-0.11 |
1133 |
- !<sys-fs/cryptsetup-1.1.2 |
1134 |
- !!sys-fs/lvm-user |
1135 |
- >=sys-apps/util-linux-2.16 |
1136 |
- lvm2create_initrd? ( sys-apps/makedev ) |
1137 |
- thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )" |
1138 |
-# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check |
1139 |
-# USE 'static' currently only works with eudev, bug 520450 |
1140 |
-DEPEND="${DEPEND_COMMON} |
1141 |
- virtual/pkgconfig |
1142 |
- >=sys-devel/binutils-2.20.1-r1 |
1143 |
- sys-devel/autoconf-archive |
1144 |
- static? ( |
1145 |
- selinux? ( sys-libs/libselinux[static-libs] ) |
1146 |
- udev? ( >=sys-fs/eudev-3.1.2[static-libs] ) |
1147 |
- >=sys-apps/util-linux-2.16[static-libs] |
1148 |
- )" |
1149 |
- |
1150 |
-S=${WORKDIR}/${PN/lvm/LVM}.${PV} |
1151 |
- |
1152 |
-PATCHES=( |
1153 |
- # Gentoo specific modification(s): |
1154 |
- "${FILESDIR}"/${PN}-2.02.129-example.conf.in.patch |
1155 |
- |
1156 |
- # For upstream -- review and forward: |
1157 |
- "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch |
1158 |
- "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch |
1159 |
- "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331 |
1160 |
- "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373 |
1161 |
- "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed |
1162 |
- "${FILESDIR}"/${PN}-2.02.139-dynamic-static-ldflags.patch #332905 |
1163 |
- "${FILESDIR}"/${PN}-2.02.129-static-pkgconfig-libs.patch #370217, #439414 + blkid |
1164 |
- "${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450 |
1165 |
- "${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 |
1166 |
-) |
1167 |
- |
1168 |
-pkg_setup() { |
1169 |
- local CONFIG_CHECK="~SYSVIPC" |
1170 |
- |
1171 |
- if use udev; then |
1172 |
- local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n" |
1173 |
- if linux_config_exists; then |
1174 |
- local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH) |
1175 |
- if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then |
1176 |
- ewarn "It's recommended to set an empty value to the following kernel config option:" |
1177 |
- ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}" |
1178 |
- fi |
1179 |
- fi |
1180 |
- fi |
1181 |
- |
1182 |
- check_extra_config |
1183 |
- |
1184 |
- # 1. Genkernel no longer copies /sbin/lvm blindly. |
1185 |
- if use static; then |
1186 |
- elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with" |
1187 |
- elog "their static versions. If you need the static binaries," |
1188 |
- elog "you must append .static to the filename!" |
1189 |
- fi |
1190 |
-} |
1191 |
- |
1192 |
-src_prepare() { |
1193 |
- default |
1194 |
- |
1195 |
- sed -i \ |
1196 |
- -e "1iAR = $(tc-getAR)" \ |
1197 |
- -e "s:CC ?= @CC@:CC = $(tc-getCC):" \ |
1198 |
- make.tmpl.in || die #444082 |
1199 |
- |
1200 |
- sed -i -e '/FLAG/s:-O2::' configure{.in,} || die #480212 |
1201 |
- |
1202 |
- if use udev && ! use device-mapper-only; then |
1203 |
- sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196 |
1204 |
- elog "Notice that \"use_lvmetad\" setting is enabled with USE=\"udev\" in" |
1205 |
- elog "/etc/lvm/lvm.conf, which will require restart of udev, lvm, and lvmetad" |
1206 |
- elog "if it was previously disabled." |
1207 |
- fi |
1208 |
- |
1209 |
- sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514 |
1210 |
- |
1211 |
- # Without thin-privision-tools, there is nothing to install for target install_man7: |
1212 |
- use thin || { sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die; } |
1213 |
- |
1214 |
- eautoreconf |
1215 |
-} |
1216 |
- |
1217 |
-src_configure() { |
1218 |
- filter-flags -flto |
1219 |
- local myconf=() |
1220 |
- local buildmode |
1221 |
- |
1222 |
- myconf+=( $(use_enable !device-mapper-only dmeventd) ) |
1223 |
- myconf+=( $(use_enable !device-mapper-only cmdlib) ) |
1224 |
- myconf+=( $(use_enable !device-mapper-only applib) ) |
1225 |
- myconf+=( $(use_enable !device-mapper-only fsadm) ) |
1226 |
- myconf+=( $(use_enable !device-mapper-only lvmetad) ) |
1227 |
- use device-mapper-only && myconf+=( --disable-udev-systemd-background-jobs ) |
1228 |
- |
1229 |
- # Most of this package does weird stuff. |
1230 |
- # The build options are tristate, and --without is NOT supported |
1231 |
- # options: 'none', 'internal', 'shared' |
1232 |
- if use static; then |
1233 |
- buildmode="internal" |
1234 |
- # This only causes the .static versions to become available |
1235 |
- myconf+=( --enable-static_link ) |
1236 |
- else |
1237 |
- buildmode="shared" |
1238 |
- fi |
1239 |
- dmbuildmode=$(use !device-mapper-only && echo internal || echo none) |
1240 |
- |
1241 |
- # dmeventd requires mirrors to be internal, and snapshot available |
1242 |
- # so we cannot disable them |
1243 |
- myconf+=( --with-mirrors=${dmbuildmode} ) |
1244 |
- myconf+=( --with-snapshots=${dmbuildmode} ) |
1245 |
- if use thin; then |
1246 |
- myconf+=( --with-thin=internal --with-cache=internal ) |
1247 |
- local texec |
1248 |
- for texec in check dump repair restore; do |
1249 |
- myconf+=( --with-thin-${texec}="${EPREFIX}"/sbin/thin_${texec} ) |
1250 |
- myconf+=( --with-cache-${texec}="${EPREFIX}"/sbin/cache_${texec} ) |
1251 |
- done |
1252 |
- else |
1253 |
- myconf+=( --with-thin=none --with-cache=none ) |
1254 |
- fi |
1255 |
- |
1256 |
- if use lvm1; then |
1257 |
- myconf+=( --with-lvm1=${buildmode} ) |
1258 |
- else |
1259 |
- myconf+=( --with-lvm1=none ) |
1260 |
- fi |
1261 |
- |
1262 |
- # disable O_DIRECT support on hppa, breaks pv detection (#99532) |
1263 |
- use hppa && myconf+=( --disable-o_direct ) |
1264 |
- |
1265 |
- myconf+=( --with-clvmd=none --with-cluster=none ) |
1266 |
- |
1267 |
- econf \ |
1268 |
- $(use_enable readline) \ |
1269 |
- $(use_enable selinux) \ |
1270 |
- --enable-pkgconfig \ |
1271 |
- --with-confdir="${EPREFIX}"/etc \ |
1272 |
- --exec-prefix="${EPREFIX}" \ |
1273 |
- --sbindir="${EPREFIX}/sbin" \ |
1274 |
- --with-staticdir="${EPREFIX}"/sbin \ |
1275 |
- --libdir="${EPREFIX}/$(get_libdir)" \ |
1276 |
- --with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \ |
1277 |
- --with-default-dm-run-dir=/run \ |
1278 |
- --with-default-run-dir=/run/lvm \ |
1279 |
- --with-default-locking-dir=/run/lock/lvm \ |
1280 |
- --with-default-pid-dir=/run \ |
1281 |
- $(use_enable udev udev_rules) \ |
1282 |
- $(use_enable udev udev_sync) \ |
1283 |
- $(use_with udev udevdir "$(get_udevdir)"/rules.d) \ |
1284 |
- $(use_enable systemd udev-systemd-background-jobs) \ |
1285 |
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ |
1286 |
- ${myconf[@]} \ |
1287 |
- CLDFLAGS="${LDFLAGS}" |
1288 |
-} |
1289 |
- |
1290 |
-src_compile() { |
1291 |
- pushd include >/dev/null |
1292 |
- emake |
1293 |
- popd >/dev/null |
1294 |
- |
1295 |
- if use device-mapper-only ; then |
1296 |
- emake device-mapper |
1297 |
- else |
1298 |
- emake |
1299 |
- emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat |
1300 |
- fi |
1301 |
-} |
1302 |
- |
1303 |
-src_install() { |
1304 |
- local inst |
1305 |
- INSTALL_TARGETS="install install_tmpfiles_configuration" |
1306 |
- # install systemd related files only when requested, bug #522430 |
1307 |
- use systemd && INSTALL_TARGETS="${INSTALL_TARGETS} install_systemd_units install_systemd_generators" |
1308 |
- use device-mapper-only && INSTALL_TARGETS="install_device-mapper" |
1309 |
- for inst in ${INSTALL_TARGETS}; do |
1310 |
- emake DESTDIR="${D}" ${inst} |
1311 |
- done |
1312 |
- |
1313 |
- newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper |
1314 |
- newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper |
1315 |
- |
1316 |
- if use !device-mapper-only ; then |
1317 |
- newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd |
1318 |
- newinitd "${FILESDIR}"/lvm.rc-2.02.116-r6 lvm |
1319 |
- newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm |
1320 |
- |
1321 |
- newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring |
1322 |
- newinitd "${FILESDIR}"/lvmetad.initd-2.02.116-r3 lvmetad |
1323 |
- fi |
1324 |
- |
1325 |
- if use static-libs; then |
1326 |
- dolib.a libdm/ioctl/libdevmapper.a |
1327 |
- if use !device-mapper-only ; then |
1328 |
- dolib.a libdaemon/client/libdaemonclient.a #462908 |
1329 |
- dolib.a daemons/dmeventd/libdevmapper-event.a |
1330 |
- fi |
1331 |
- else |
1332 |
- rm -f "${ED}"usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a |
1333 |
- fi |
1334 |
- |
1335 |
- if use lvm2create_initrd; then |
1336 |
- dosbin scripts/lvm2create_initrd/lvm2create_initrd |
1337 |
- doman scripts/lvm2create_initrd/lvm2create_initrd.8 |
1338 |
- newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd |
1339 |
- fi |
1340 |
- |
1341 |
- insinto /etc |
1342 |
- doins "${FILESDIR}"/dmtab |
1343 |
- |
1344 |
- dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf |
1345 |
-} |
1346 |
- |
1347 |
-pkg_postinst() { |
1348 |
- ewarn "Make sure the \"lvm\" init script is in the runlevels:" |
1349 |
- ewarn "# rc-update add lvm boot" |
1350 |
- ewarn |
1351 |
- ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want" |
1352 |
- ewarn "to enable lvm autoactivation and metadata caching." |
1353 |
-} |
1354 |
- |
1355 |
-src_test() { |
1356 |
- einfo "Tests are disabled because of device-node mucking, if you want to" |
1357 |
- einfo "run tests, compile the package and see ${S}/tests" |
1358 |
-} |
1359 |
|
1360 |
diff --git a/sys-fs/lvm2/metadata.xml b/sys-fs/lvm2/metadata.xml |
1361 |
index 019c533da75..0761d9dca00 100644 |
1362 |
--- a/sys-fs/lvm2/metadata.xml |
1363 |
+++ b/sys-fs/lvm2/metadata.xml |
1364 |
@@ -16,7 +16,6 @@ |
1365 |
<description>Upstream Maintainer (please CC on bugs)</description> |
1366 |
</maintainer> |
1367 |
<use> |
1368 |
- <flag name="lvm1">Allow users to build lvm2 with lvm1 support</flag> |
1369 |
<flag name="lvm2create_initrd">Install lvm2create_initrd script and pull in <pkg>sys-apps/makedev</pkg> for the /sbin/MAKEDEV command</flag> |
1370 |
<flag name="thin">Support for thin volumes</flag> |
1371 |
<flag name="device-mapper-only">Build only device-mapper and not the rest of LVM2 (UNSUPPORTED)</flag> |