Gentoo Archives: gentoo-commits

From: David Seifert <soap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/lvm2/
Date: Mon, 28 Nov 2022 11:31:10
Message-Id: 1669635055.fd90a5c3c9e20f998fb57e66f111ba11284eeae2.soap@gentoo
1 commit: fd90a5c3c9e20f998fb57e66f111ba11284eeae2
2 Author: David Seifert <soap <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 28 11:30:55 2022 +0000
4 Commit: David Seifert <soap <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 28 11:30:55 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd90a5c3
7
8 sys-fs/lvm2: drop 2.03.16-r3
9
10 Signed-off-by: David Seifert <soap <AT> gentoo.org>
11
12 sys-fs/lvm2/Manifest | 1 -
13 sys-fs/lvm2/lvm2-2.03.16-r3.ebuild | 324 -------------------------------------
14 2 files changed, 325 deletions(-)
15
16 diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
17 index d460e037d4b5..5d8395d11f1b 100644
18 --- a/sys-fs/lvm2/Manifest
19 +++ b/sys-fs/lvm2/Manifest
20 @@ -1,3 +1,2 @@
21 DIST LVM2.2.03.14.tgz 2639538 BLAKE2B 806f5e9cb76a05febef6f8ce8cfc42c92927b9538f62a21029c5ffc426a4fd7c3f32709be08dbd8028b53891b1075d1d13cb3b0d7b1815071ee8eb927d8f3ed3 SHA512 6a93bed1d5cf36f0f48d4d413d028b0e480cd4fc20e25d173770a892f265d2a0cc68d01a720b1513469953649e989532cd0c45f9538f92a4190eb3dc4555857d
22 -DIST LVM2.2.03.16.tgz 2658805 BLAKE2B 05c6089adff0c61ff1281a05a917f75480ad4acc28cb0214a42589d206a61168f68de07891b9af9814ed7998f16aff6f29ba29b85b23de36f38bf3b5f27802c1 SHA512 084ba4080537359458db936637fc7f83bb9bfcf2de9f3660882551b5c31c7e9900c7d381b238ce1bb7629942c740c121f0dea5e404c302d31ed028b5c65efaa5
23 DIST LVM2.2.03.17.tgz 2726793 BLAKE2B 425e52fe2d7832f8440203d2b6ffc3a097903abea8be07bbbf4864001d5f55083954e561a92b0fe4fc467533e465af3958b25cf33d2693f50f077dc3d9b74bd2 SHA512 ce9f4c10a7e89b397fa021098976117c062227da4f25996296dd3678c0aeb826edf9b7e4f5d3992f42156865ae47cb98671ec37a26868710174a473b42cc70a9
24
25 diff --git a/sys-fs/lvm2/lvm2-2.03.16-r3.ebuild b/sys-fs/lvm2/lvm2-2.03.16-r3.ebuild
26 deleted file mode 100644
27 index 22b60b03d2cc..000000000000
28 --- a/sys-fs/lvm2/lvm2-2.03.16-r3.ebuild
29 +++ /dev/null
30 @@ -1,324 +0,0 @@
31 -# Copyright 1999-2022 Gentoo Authors
32 -# Distributed under the terms of the GNU General Public License v2
33 -
34 -EAPI=8
35 -
36 -TMPFILES_OPTIONAL=1
37 -inherit autotools linux-info systemd toolchain-funcs tmpfiles udev flag-o-matic
38 -
39 -DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
40 -HOMEPAGE="https://sourceware.org/lvm2/"
41 -SRC_URI="https://sourceware.org/ftp/lvm2/${PN^^}.${PV}.tgz"
42 -S="${WORKDIR}/${PN^^}.${PV}"
43 -
44 -LICENSE="GPL-2"
45 -SLOT="0"
46 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
47 -IUSE="+lvm lvm2create-initrd readline sanlock selinux static static-libs systemd +thin +udev"
48 -REQUIRED_USE="
49 - static? ( !systemd !udev )
50 - static-libs? ( static !udev )
51 - systemd? ( udev )"
52 -
53 -DEPEND_COMMON="
54 - udev? ( virtual/libudev:= )
55 - lvm? (
56 - dev-libs/libaio
57 - sys-apps/util-linux
58 - readline? ( sys-libs/readline:= )
59 - sanlock? ( sys-cluster/sanlock )
60 - systemd? ( sys-apps/systemd:= )
61 - )"
62 -# /run is now required for locking during early boot. /var cannot be assumed to
63 -# be available -- thus, pull in recent enough baselayout for /run.
64 -# This version of LVM is incompatible with cryptsetup <1.1.2.
65 -RDEPEND="${DEPEND_COMMON}
66 - >=sys-apps/baselayout-2.2
67 - lvm? (
68 - virtual/tmpfiles
69 - lvm2create-initrd? ( sys-apps/makedev )
70 - thin? ( sys-block/thin-provisioning-tools )
71 - )"
72 -# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
73 -DEPEND="${DEPEND_COMMON}
74 - static? (
75 - lvm? (
76 - dev-libs/libaio[static-libs]
77 - sys-apps/util-linux[static-libs]
78 - readline? ( sys-libs/readline[static-libs] )
79 - )
80 - selinux? ( sys-libs/libselinux[static-libs] )
81 - )"
82 -BDEPEND="
83 - sys-devel/autoconf-archive
84 - virtual/pkgconfig"
85 -
86 -PATCHES=(
87 - # Gentoo specific modification(s):
88 - "${FILESDIR}"/${PN}-2.03.06-example.conf.in.patch
89 -
90 - # For upstream -- review and forward:
91 - "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
92 - "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
93 - "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
94 - "${FILESDIR}"/${PN}-2.03.12-dynamic-static-ldflags.patch #332905
95 - "${FILESDIR}"/${PN}-2.03.14-static-pkgconfig-libs.patch #370217, #439414 + blkid
96 - "${FILESDIR}"/${PN}-2.03.12-static-pkgconfig-libs-2.patch
97 - "${FILESDIR}"/${PN}-2.03.05-pthread-pkgconfig.patch #492450
98 - "${FILESDIR}"/${PN}-2.03.12-static-libm.patch #617756
99 - "${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446
100 - "${FILESDIR}"/${PN}-2.03.05-dmeventd-no-idle-exit.patch
101 - "${FILESDIR}"/${PN}-2.03.14-r1-add-fcntl.patch
102 - "${FILESDIR}"/${PN}-2.03.14-r1-fopen-to-freopen.patch
103 - "${FILESDIR}"/${PN}-2.03.14-r1-mallinfo.patch
104 - "${FILESDIR}"/${PN}-2.03.14-freopen_n2.patch
105 - "${FILESDIR}"/${PN}-2.03.16-readelf.patch
106 - "${FILESDIR}"/${PN}-2.03.16-musl-strerror_r.patch
107 -)
108 -
109 -QA_CONFIGURE_OPTIONS="--disable-static"
110 -
111 -pkg_setup() {
112 - local CONFIG_CHECK="~SYSVIPC"
113 -
114 - if use udev; then
115 - local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
116 - if linux_config_exists; then
117 - local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
118 - if [[ -n "${uevent_helper_path}" ]] && [[ "${uevent_helper_path}" != '""' ]]; then
119 - ewarn "It's recommended to set an empty value to the following kernel config option:"
120 - ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
121 - fi
122 - fi
123 - fi
124 -
125 - check_extra_config
126 -
127 - # 1. Genkernel no longer copies /sbin/lvm blindly.
128 - if use static; then
129 - elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
130 - elog "their static versions. If you need the static binaries,"
131 - elog "you must append .static to the filename!"
132 - fi
133 -}
134 -
135 -src_prepare() {
136 - default
137 -
138 - # Users without systemd get no auto-activation of any logical volume
139 - if ! use systemd ; then
140 - eapply "${FILESDIR}"/${PN}-2.03.16-dm_lvm_rules_no_systemd.patch
141 - sed -i -e '/^USE_SD_NOTIFY=yes$/s/yes/no/' daemons/lvmlockd/Makefile.in || die
142 - fi
143 -
144 - sed -i \
145 - -e "1iAR = $(tc-getAR)" \
146 - -e "s:CC ?= @CC@:CC = $(tc-getCC):" \
147 - make.tmpl.in || die #444082
148 -
149 - sed -i -e '/FLAG/s:-O2::' configure{.ac,} || die #480212
150 -
151 - sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514
152 -
153 - # Don't install thin man page when not requested
154 - if ! use lvm || ! use thin ; then
155 - sed -i -e 's/^\(MAN7+=.*\) $(LVMTHINMAN) \(.*\)$/\1 \2/' man/Makefile.in || die
156 - fi
157 -
158 - eautoreconf
159 -}
160 -
161 -src_configure() {
162 - filter-flags -flto
163 -
164 - # Workaround for bug #822210
165 - tc-ld-disable-gold
166 -
167 - local myeconfargs=()
168 -
169 - # Most of this package does weird stuff.
170 - # The build options are tristate, and --without is NOT supported
171 - # options: 'none', 'internal', 'shared'
172 - myeconfargs+=(
173 - $(use_enable lvm dmfilemapd)
174 - $(use_enable lvm dmeventd)
175 - $(use_enable lvm cmdlib)
176 - $(use_enable lvm fsadm)
177 - $(use_enable lvm lvmpolld)
178 - $(usev !lvm --disable-udev-systemd-background-jobs)
179 -
180 - # This only causes the .static versions to become available
181 - $(usev static --enable-static_link)
182 -
183 - # dmeventd requires mirrors to be internal, and snapshot available
184 - # so we cannot disable them
185 - --with-mirrors="$(usex lvm internal none)"
186 - --with-snapshots="$(usex lvm internal none)"
187 -
188 - # disable O_DIRECT support on hppa, breaks pv detection (#99532)
189 - $(usev hppa --disable-o_direct)
190 - )
191 -
192 - if use lvm && use thin; then
193 - myeconfargs+=( --with-thin=internal --with-cache=internal )
194 - local texec
195 - for texec in check dump repair restore; do
196 - myeconfargs+=( --with-thin-${texec}="${EPREFIX}"/sbin/thin_${texec} )
197 - myeconfargs+=( --with-cache-${texec}="${EPREFIX}"/sbin/cache_${texec} )
198 - done
199 - else
200 - myeconfargs+=( --with-thin=none --with-cache=none )
201 - fi
202 -
203 - export READELF="$(tc-getREADELF)"
204 -
205 - myeconfargs+=(
206 - # musl doesn't do symbol versioning so can end up with
207 - # runtime breakage.
208 - --with-symvers=$(usex elibc_glibc 'gnu' 'no')
209 - $(use_enable readline)
210 - $(use_enable selinux)
211 - --enable-pkgconfig
212 - --with-confdir="${EPREFIX}"/etc
213 - --exec-prefix="${EPREFIX}"
214 - --sbindir="${EPREFIX}/sbin"
215 - --with-staticdir="${EPREFIX}"/sbin
216 - --libdir="${EPREFIX}/$(get_libdir)"
217 - --with-usrlibdir="${EPREFIX}/usr/$(get_libdir)"
218 - --with-default-dm-run-dir=/run
219 - --with-default-run-dir=/run/lvm
220 - --with-default-locking-dir=/run/lock/lvm
221 - --with-default-pid-dir=/run
222 - $(use_enable udev udev_rules)
223 - $(use_enable udev udev_sync)
224 - $(use_with udev udevdir "${EPREFIX}$(get_udevdir)"/rules.d)
225 - # USE=sanlock requires USE=lvm
226 - $(use_enable $(usex lvm sanlock lvm) lvmlockd-sanlock)
227 - $(use_enable systemd udev-systemd-background-jobs)
228 - $(use_enable systemd notify-dbus)
229 - $(use_enable systemd app-machineid)
230 - $(use_enable systemd systemd-journal)
231 - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
232 - CLDFLAGS="${LDFLAGS}"
233 - READELF="${READELF}"
234 - )
235 -
236 - # Hard-wire this to bash as some shells (dash) don't know
237 - # "-o pipefail" #682404
238 - CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}"
239 -}
240 -
241 -src_compile() {
242 - emake V=1 -C include
243 -
244 - if use lvm ; then
245 - emake V=1
246 - emake V=1 CC="$(tc-getCC)" -C scripts
247 - else
248 - emake V=1 device-mapper
249 - # https://bugs.gentoo.org/878131
250 - emake V=1 -C libdm/dm-tools device-mapper
251 - fi
252 -}
253 -
254 -src_test() {
255 - einfo "Tests are disabled because of device-node mucking, if you want to"
256 - einfo "run tests, compile the package and see ${S}/tests"
257 -}
258 -
259 -src_install() {
260 - local INSTALL_TARGETS=(
261 - # full LVM2
262 - $(usev lvm "install install_tmpfiles_configuration")
263 - # install systemd related files only when requested, bug #522430
264 - $(usev $(usex lvm systemd lvm) "SYSTEMD_GENERATOR_DIR=$(systemd_get_systemgeneratordir) install_systemd_units install_systemd_generators")
265 -
266 - # install dm unconditionally
267 - install_device-mapper
268 - )
269 - emake V=1 DESTDIR="${D}" "${INSTALL_TARGETS[@]}"
270 -
271 - newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper
272 - newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
273 -
274 - if use lvm ; then
275 - newinitd "${FILESDIR}"/dmeventd.initd-2.02.184-r2 dmeventd
276 - newinitd "${FILESDIR}"/lvm.rc-2.02.187 lvm
277 - newconfd "${FILESDIR}"/lvm.confd-2.02.184-r3 lvm
278 - if ! use udev ; then
279 - # We keep the variable but remove udev from it.
280 - sed -r -i \
281 - -e '/^rc_need=/s/\<udev\>//g' \
282 - "${ED}"/etc/conf.d/lvm || die "Could not drop udev from rc_need"
283 - fi
284 -
285 - newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring
286 - newinitd "${FILESDIR}"/lvmpolld.initd-2.02.183 lvmpolld
287 -
288 - if use lvm2create-initrd; then
289 - dosbin scripts/lvm2create_initrd/lvm2create_initrd
290 - doman scripts/lvm2create_initrd/lvm2create_initrd.8
291 - newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
292 - fi
293 -
294 - if use sanlock; then
295 - newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd
296 - fi
297 - fi
298 -
299 - if use static-libs; then
300 - dolib.a libdm/ioctl/libdevmapper.a
301 - if use lvm; then
302 - # depends on lvmetad
303 - dolib.a libdaemon/client/libdaemonclient.a #462908
304 - # depends on dmeventd
305 - dolib.a daemons/dmeventd/libdevmapper-event.a
306 - fi
307 - else
308 - rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a || die
309 - fi
310 -
311 - insinto /etc
312 - doins "${FILESDIR}"/dmtab
313 -
314 - dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
315 -}
316 -
317 -pkg_postinst() {
318 - use lvm && tmpfiles_process lvm2.conf
319 -
320 - if use udev; then
321 - udev_reload
322 - fi
323 -
324 - if [[ -z "${REPLACING_VERSIONS}" ]]; then
325 - # This is a new installation
326 - ewarn "Make sure the \"lvm\" init script is in the runlevels:"
327 - ewarn "# rc-update add lvm boot"
328 - ewarn
329 - ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want"
330 - ewarn "to enable lvm autoactivation and metadata caching."
331 - fi
332 -
333 - if use udev && [[ -d /run ]] ; then
334 - local permission_run_expected="drwxr-xr-x"
335 - local permission_run=$(stat -c "%A" /run)
336 - if [[ "${permission_run}" != "${permission_run_expected}" ]] ; then
337 - ewarn "Found the following problematic permissions:"
338 - ewarn ""
339 - ewarn " ${permission_run} /run"
340 - ewarn ""
341 - ewarn "Expected:"
342 - ewarn ""
343 - ewarn " ${permission_run_expected} /run"
344 - ewarn ""
345 - ewarn "This is known to be causing problems for UDEV-enabled LVM services."
346 - fi
347 - fi
348 -}
349 -
350 -pkg_postrm() {
351 - if use udev && [[ -z ${REPLACED_BY_VERSION} ]]; then
352 - udev_reload
353 - fi
354 -}