| 1 |
commit: 465f8cba7d8cb10d83bd01bb11f7366931f64f93 |
| 2 |
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jun 24 17:17:19 2022 +0000 |
| 4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jun 24 17:17:19 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=465f8cba |
| 7 |
|
| 8 |
sys-fs/lvm2: Fix builds for musl users |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 11 |
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> |
| 12 |
|
| 13 |
...-2.02.188-r2.ebuild => lvm2-2.02.188-r3.ebuild} | 41 +++++++++++----------- |
| 14 |
sys-fs/lvm2/metadata.xml | 15 ++++---- |
| 15 |
2 files changed, 27 insertions(+), 29 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.188-r3.ebuild |
| 18 |
similarity index 92% |
| 19 |
rename from sys-fs/lvm2/lvm2-2.02.188-r2.ebuild |
| 20 |
rename to sys-fs/lvm2/lvm2-2.02.188-r3.ebuild |
| 21 |
index 14cda96d..493fc838 100644 |
| 22 |
--- a/sys-fs/lvm2/lvm2-2.02.188-r2.ebuild |
| 23 |
+++ b/sys-fs/lvm2/lvm2-2.02.188-r3.ebuild |
| 24 |
@@ -1,8 +1,9 @@ |
| 25 |
-# Copyright 1999-2021 Gentoo Authors |
| 26 |
+# Copyright 1999-2022 Gentoo Authors |
| 27 |
# Distributed under the terms of the GNU General Public License v2 |
| 28 |
|
| 29 |
EAPI=7 |
| 30 |
-inherit autotools linux-info multilib systemd toolchain-funcs tmpfiles udev flag-o-matic |
| 31 |
+TMPFILES_OPTIONAL=1 |
| 32 |
+inherit autotools linux-info systemd toolchain-funcs tmpfiles udev flag-o-matic |
| 33 |
|
| 34 |
DESCRIPTION="User-land utilities for LVM2 (device-mapper) software" |
| 35 |
HOMEPAGE="https://sourceware.org/lvm2/" |
| 36 |
@@ -12,8 +13,8 @@ SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz |
| 37 |
LICENSE="GPL-2" |
| 38 |
SLOT="0" |
| 39 |
KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86" |
| 40 |
-IUSE="readline static static-libs systemd lvm2create_initrd sanlock selinux +udev +thin device-mapper-only" |
| 41 |
-REQUIRED_USE="device-mapper-only? ( !lvm2create_initrd !sanlock !thin ) |
| 42 |
+IUSE="readline static static-libs systemd lvm2create-initrd sanlock selinux +udev +thin device-mapper-only" |
| 43 |
+REQUIRED_USE="device-mapper-only? ( !lvm2create-initrd !sanlock !thin ) |
| 44 |
static? ( !systemd !udev ) |
| 45 |
static-libs? ( !udev ) |
| 46 |
systemd? ( udev )" |
| 47 |
@@ -31,11 +32,9 @@ DEPEND_COMMON=" |
| 48 |
# This version of LVM is incompatible with cryptsetup <1.1.2. |
| 49 |
RDEPEND="${DEPEND_COMMON} |
| 50 |
>=sys-apps/baselayout-2.2 |
| 51 |
- !<sys-apps/openrc-0.11 |
| 52 |
- !<sys-fs/cryptsetup-1.1.2 |
| 53 |
- !!sys-fs/lvm-user |
| 54 |
>=sys-apps/util-linux-2.16 |
| 55 |
- lvm2create_initrd? ( sys-apps/makedev ) |
| 56 |
+ lvm2create-initrd? ( sys-apps/makedev ) |
| 57 |
+ !device-mapper-only? ( virtual/tmpfiles ) |
| 58 |
thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )" |
| 59 |
# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check |
| 60 |
DEPEND="${DEPEND_COMMON} |
| 61 |
@@ -54,11 +53,6 @@ PATCHES=( |
| 62 |
# Gentoo specific modification(s): |
| 63 |
"${FILESDIR}"/${PN}-2.02.178-example.conf.in.patch |
| 64 |
|
| 65 |
- # Musl fixes |
| 66 |
- "${FILESDIR}"/${PN}-2.02.183-fix-stdio-usage.patch |
| 67 |
- "${FILESDIR}"/${PN}-2.02.183-portability.patch |
| 68 |
- "${FILESDIR}"/${PN}-2.02.183-implement-libc-specific-reopen_stream.patch |
| 69 |
- |
| 70 |
# For upstream -- review and forward: |
| 71 |
"${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch |
| 72 |
"${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch |
| 73 |
@@ -75,6 +69,11 @@ PATCHES=( |
| 74 |
#"${FILESDIR}"/${PN}-2.02.184-allow-reading-metadata-with-invalid-creation_time.patch #682380 # merged upstream |
| 75 |
"${FILESDIR}"/${PN}-2.02.184-mksh_build.patch #686652 |
| 76 |
"${FILESDIR}"/${PN}-2.02.186-udev_remove_unsupported_option.patch #700160 |
| 77 |
+ |
| 78 |
+ # Musl fixes |
| 79 |
+ "${FILESDIR}"/${PN}-2.02.183-fix-stdio-usage.patch |
| 80 |
+ "${FILESDIR}"/${PN}-2.02.183-portability.patch |
| 81 |
+ "${FILESDIR}"/${PN}-2.02.183-implement-libc-specific-reopen_stream.patch |
| 82 |
) |
| 83 |
|
| 84 |
pkg_setup() { |
| 85 |
@@ -213,14 +212,12 @@ src_compile() { |
| 86 |
} |
| 87 |
|
| 88 |
src_install() { |
| 89 |
- local inst INSTALL_TARGETS |
| 90 |
- INSTALL_TARGETS=( install install_tmpfiles_configuration ) |
| 91 |
+ local inst |
| 92 |
+ local INSTALL_TARGETS=( install install_tmpfiles_configuration ) |
| 93 |
# install systemd related files only when requested, bug #522430 |
| 94 |
- use systemd && INSTALL_TARGETS+=( install_systemd_units install_systemd_generators ) |
| 95 |
+ use systemd && INSTALL_TARGETS+=( SYSTEMD_GENERATOR_DIR="$(systemd_get_systemgeneratordir)" install_systemd_units install_systemd_generators ) |
| 96 |
use device-mapper-only && INSTALL_TARGETS=( install_device-mapper ) |
| 97 |
- for inst in ${INSTALL_TARGETS[@]}; do |
| 98 |
- emake V=1 DESTDIR="${D}" ${inst} |
| 99 |
- done |
| 100 |
+ emake V=1 DESTDIR="${D}" "${INSTALL_TARGETS[@]}" |
| 101 |
|
| 102 |
newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper |
| 103 |
newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper |
| 104 |
@@ -257,7 +254,7 @@ src_install() { |
| 105 |
rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a |
| 106 |
fi |
| 107 |
|
| 108 |
- if use lvm2create_initrd; then |
| 109 |
+ if use lvm2create-initrd; then |
| 110 |
dosbin scripts/lvm2create_initrd/lvm2create_initrd |
| 111 |
doman scripts/lvm2create_initrd/lvm2create_initrd.8 |
| 112 |
newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd |
| 113 |
@@ -270,7 +267,9 @@ src_install() { |
| 114 |
} |
| 115 |
|
| 116 |
pkg_postinst() { |
| 117 |
- tmpfiles_process lvm2.conf |
| 118 |
+ if ! use device-mapper-only; then |
| 119 |
+ tmpfiles_process lvm2.conf |
| 120 |
+ fi |
| 121 |
|
| 122 |
if [[ -z "${REPLACING_VERSIONS}" ]]; then |
| 123 |
# This is a new installation |
| 124 |
|
| 125 |
diff --git a/sys-fs/lvm2/metadata.xml b/sys-fs/lvm2/metadata.xml |
| 126 |
index 8eb6a410..e264bd79 100644 |
| 127 |
--- a/sys-fs/lvm2/metadata.xml |
| 128 |
+++ b/sys-fs/lvm2/metadata.xml |
| 129 |
@@ -1,22 +1,21 @@ |
| 130 |
<?xml version="1.0" encoding="UTF-8"?> |
| 131 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
| 132 |
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> |
| 133 |
<pkgmetadata> |
| 134 |
+ <maintainer type="project"> |
| 135 |
+ <email>base-system@g.o</email> |
| 136 |
+ <name>Gentoo Base System</name> |
| 137 |
+ </maintainer> |
| 138 |
<maintainer type="person"> |
| 139 |
<email>robbat2@g.o</email> |
| 140 |
<name>Robin H. Johnson</name> |
| 141 |
</maintainer> |
| 142 |
- <maintainer type="person"> |
| 143 |
+ <maintainer type="person" proxied="yes"> |
| 144 |
<email>agk@××××××.com</email> |
| 145 |
<name>Alasdair Kergon</name> |
| 146 |
<description>Upstream Maintainer (please CC on bugs)</description> |
| 147 |
</maintainer> |
| 148 |
- <maintainer type="person"> |
| 149 |
- <email>cardoe@g.o</email> |
| 150 |
- <name>Doug Goldstein</name> |
| 151 |
- <description>Backup to Robin. Please CC on bugs.</description> |
| 152 |
- </maintainer> |
| 153 |
<use> |
| 154 |
- <flag name="lvm2create_initrd">Install lvm2create_initrd script and pull in <pkg>sys-apps/makedev</pkg> for the /sbin/MAKEDEV command</flag> |
| 155 |
+ <flag name="lvm2create-initrd">Install lvm2create_initrd script and pull in <pkg>sys-apps/makedev</pkg> for the /sbin/MAKEDEV command</flag> |
| 156 |
<flag name="thin">Support for thin volumes</flag> |
| 157 |
<flag name="device-mapper-only">Build only device-mapper and not the rest of LVM2 (UNSUPPORTED)</flag> |
| 158 |
<flag name="sanlock">Enable lvmlockd with support for sanlock</flag> |
Archives