commit: f613f36003b14030478b90d57f908d63e2097a82 Author: David Seifert <soap <AT> gentoo <DOT> org> AuthorDate: Fri Oct 28 17:49:52 2022 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Fri Oct 28 17:49:52 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f613f360
sys-fs/lvm2: switch to positive USE=lvm logic Closes: https://github.com/gentoo/gentoo/pull/27994 Closes: https://bugs.gentoo.org/718910 Signed-off-by: David Seifert <soap <AT> gentoo.org> ...irt-7.7.0-r2.ebuild => libvirt-7.7.0-r3.ebuild} | 4 +- ...ibvirt-8.2.0.ebuild => libvirt-8.2.0-r1.ebuild} | 4 +- ...ibvirt-8.7.0.ebuild => libvirt-8.7.0-r1.ebuild} | 4 +- ...ibvirt-8.8.0.ebuild => libvirt-8.8.0-r1.ebuild} | 4 +- app-emulation/libvirt/libvirt-9999.ebuild | 4 +- ...{ceph-15.2.17.ebuild => ceph-15.2.17-r1.ebuild} | 2 +- ...ph-16.2.10-r2.ebuild => ceph-16.2.10-r3.ebuild} | 2 +- ...ceph-16.2.9-r2.ebuild => ceph-16.2.9-r3.ebuild} | 2 +- ...ceph-17.2.3-r3.ebuild => ceph-17.2.3-r4.ebuild} | 2 +- .../{ceph-17.2.4.ebuild => ceph-17.2.4-r1.ebuild} | 2 +- .../{ceph-17.2.5.ebuild => ceph-17.2.5-r1.ebuild} | 2 +- ...1.46.5-r1.ebuild => e2fsprogs-1.46.5-r3.ebuild} | 2 +- ...1.46.5-r2.ebuild => e2fsprogs-1.46.5-r4.ebuild} | 2 +- ...m2-2.03.14-r3.ebuild => lvm2-2.03.14-r4.ebuild} | 33 ++--- ...{lvm2-2.03.16.ebuild => lvm2-2.03.16-r1.ebuild} | 137 +++++++++++---------- sys-fs/lvm2/metadata.xml | 2 +- 16 files changed, 107 insertions(+), 101 deletions(-) diff --git a/app-emulation/libvirt/libvirt-7.7.0-r2.ebuild b/app-emulation/libvirt/libvirt-7.7.0-r3.ebuild similarity index 98% rename from app-emulation/libvirt/libvirt-7.7.0-r2.ebuild rename to app-emulation/libvirt/libvirt-7.7.0-r3.ebuild index d796c4c01e60..4b3585f09ce9 100644 --- a/app-emulation/libvirt/libvirt-7.7.0-r2.ebuild +++ b/app-emulation/libvirt/libvirt-7.7.0-r3.ebuild @@ -84,7 +84,7 @@ RDEPEND=" iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) - lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) + lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( @@ -93,7 +93,7 @@ RDEPEND=" ) parted? ( >=sys-block/parted-1.8[device-mapper] - sys-fs/lvm2[-device-mapper-only(-)] + sys-fs/lvm2[lvm] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( diff --git a/app-emulation/libvirt/libvirt-8.2.0.ebuild b/app-emulation/libvirt/libvirt-8.2.0-r1.ebuild similarity index 98% rename from app-emulation/libvirt/libvirt-8.2.0.ebuild rename to app-emulation/libvirt/libvirt-8.2.0-r1.ebuild index 6011891826fc..f417caaa7247 100644 --- a/app-emulation/libvirt/libvirt-8.2.0.ebuild +++ b/app-emulation/libvirt/libvirt-8.2.0-r1.ebuild @@ -83,7 +83,7 @@ RDEPEND=" iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( >=net-libs/libssh-0.7:= ) libssh2? ( >=net-libs/libssh2-1.3 ) - lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) + lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( @@ -92,7 +92,7 @@ RDEPEND=" ) parted? ( >=sys-block/parted-1.8[device-mapper] - sys-fs/lvm2[-device-mapper-only(-)] + sys-fs/lvm2[lvm] ) pcap? ( >=net-libs/libpcap-1.8.0 ) policykit? ( diff --git a/app-emulation/libvirt/libvirt-8.7.0.ebuild b/app-emulation/libvirt/libvirt-8.7.0-r1.ebuild similarity index 98% rename from app-emulation/libvirt/libvirt-8.7.0.ebuild rename to app-emulation/libvirt/libvirt-8.7.0-r1.ebuild index 972e3dbc1d25..947a2eab6796 100644 --- a/app-emulation/libvirt/libvirt-8.7.0.ebuild +++ b/app-emulation/libvirt/libvirt-8.7.0-r1.ebuild @@ -88,7 +88,7 @@ RDEPEND=" iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( >=net-libs/libssh-0.7:= ) libssh2? ( >=net-libs/libssh2-1.3 ) - lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) + lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( @@ -97,7 +97,7 @@ RDEPEND=" ) parted? ( >=sys-block/parted-1.8[device-mapper] - sys-fs/lvm2[-device-mapper-only(-)] + sys-fs/lvm2[lvm] ) pcap? ( >=net-libs/libpcap-1.8.0 ) policykit? ( diff --git a/app-emulation/libvirt/libvirt-8.8.0.ebuild b/app-emulation/libvirt/libvirt-8.8.0-r1.ebuild similarity index 98% rename from app-emulation/libvirt/libvirt-8.8.0.ebuild rename to app-emulation/libvirt/libvirt-8.8.0-r1.ebuild index 92cd83c672f7..bc8725e909ff 100644 --- a/app-emulation/libvirt/libvirt-8.8.0.ebuild +++ b/app-emulation/libvirt/libvirt-8.8.0-r1.ebuild @@ -88,7 +88,7 @@ RDEPEND=" iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( >=net-libs/libssh-0.8.1:= ) libssh2? ( >=net-libs/libssh2-1.3 ) - lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) + lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( @@ -97,7 +97,7 @@ RDEPEND=" ) parted? ( >=sys-block/parted-1.8[device-mapper] - sys-fs/lvm2[-device-mapper-only(-)] + sys-fs/lvm2[lvm] ) pcap? ( >=net-libs/libpcap-1.8.0 ) policykit? ( diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index ceff67f6442c..41862ff36a59 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-9999.ebuild @@ -88,7 +88,7 @@ RDEPEND=" iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( >=net-libs/libssh-0.8.1:= ) libssh2? ( >=net-libs/libssh2-1.3 ) - lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) + lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( @@ -97,7 +97,7 @@ RDEPEND=" ) parted? ( >=sys-block/parted-1.8[device-mapper] - sys-fs/lvm2[-device-mapper-only(-)] + sys-fs/lvm2[lvm] ) pcap? ( >=net-libs/libpcap-1.8.0 ) policykit? ( diff --git a/sys-cluster/ceph/ceph-15.2.17.ebuild b/sys-cluster/ceph/ceph-15.2.17-r1.ebuild similarity index 99% rename from sys-cluster/ceph/ceph-15.2.17.ebuild rename to sys-cluster/ceph/ceph-15.2.17-r1.ebuild index 16c75727aa77..423274a240be 100644 --- a/sys-cluster/ceph/ceph-15.2.17.ebuild +++ b/sys-cluster/ceph/ceph-15.2.17-r1.ebuild @@ -134,7 +134,7 @@ RDEPEND="${DEPEND} sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi - sys-fs/lvm2[-device-mapper-only(-)] + sys-fs/lvm2[lvm] virtual/awk dev-python/bcrypt[${PYTHON_USEDEP}] dev-python/cherrypy[${PYTHON_USEDEP}] diff --git a/sys-cluster/ceph/ceph-16.2.10-r2.ebuild b/sys-cluster/ceph/ceph-16.2.10-r3.ebuild similarity index 99% rename from sys-cluster/ceph/ceph-16.2.10-r2.ebuild rename to sys-cluster/ceph/ceph-16.2.10-r3.ebuild index 79585b405bcc..2cd8c909eb1b 100644 --- a/sys-cluster/ceph/ceph-16.2.10-r2.ebuild +++ b/sys-cluster/ceph/ceph-16.2.10-r3.ebuild @@ -141,7 +141,7 @@ RDEPEND=" sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi - sys-fs/lvm2[-device-mapper-only(-)] + sys-fs/lvm2[lvm] virtual/awk dev-python/bcrypt[${PYTHON_USEDEP}] dev-python/cherrypy[${PYTHON_USEDEP}] diff --git a/sys-cluster/ceph/ceph-16.2.9-r2.ebuild b/sys-cluster/ceph/ceph-16.2.9-r3.ebuild similarity index 99% rename from sys-cluster/ceph/ceph-16.2.9-r2.ebuild rename to sys-cluster/ceph/ceph-16.2.9-r3.ebuild index a6cfee73bcba..e238384639e1 100644 --- a/sys-cluster/ceph/ceph-16.2.9-r2.ebuild +++ b/sys-cluster/ceph/ceph-16.2.9-r3.ebuild @@ -141,7 +141,7 @@ RDEPEND=" sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi - sys-fs/lvm2[-device-mapper-only(-)] + sys-fs/lvm2[lvm] virtual/awk dev-python/bcrypt[${PYTHON_USEDEP}] dev-python/cherrypy[${PYTHON_USEDEP}] diff --git a/sys-cluster/ceph/ceph-17.2.3-r3.ebuild b/sys-cluster/ceph/ceph-17.2.3-r4.ebuild similarity index 99% rename from sys-cluster/ceph/ceph-17.2.3-r3.ebuild rename to sys-cluster/ceph/ceph-17.2.3-r4.ebuild index b51469653659..b685d55ffe93 100644 --- a/sys-cluster/ceph/ceph-17.2.3-r3.ebuild +++ b/sys-cluster/ceph/ceph-17.2.3-r4.ebuild @@ -147,7 +147,7 @@ RDEPEND=" sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi - sys-fs/lvm2[-device-mapper-only(-)] + sys-fs/lvm2[lvm] virtual/awk dev-python/bcrypt[${PYTHON_USEDEP}] dev-python/cherrypy[${PYTHON_USEDEP}] diff --git a/sys-cluster/ceph/ceph-17.2.4.ebuild b/sys-cluster/ceph/ceph-17.2.4-r1.ebuild similarity index 99% rename from sys-cluster/ceph/ceph-17.2.4.ebuild rename to sys-cluster/ceph/ceph-17.2.4-r1.ebuild index a704f275f39d..27978404165d 100644 --- a/sys-cluster/ceph/ceph-17.2.4.ebuild +++ b/sys-cluster/ceph/ceph-17.2.4-r1.ebuild @@ -149,7 +149,7 @@ RDEPEND=" sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi - sys-fs/lvm2[-device-mapper-only(-)] + sys-fs/lvm2[lvm] virtual/awk dev-python/bcrypt[${PYTHON_USEDEP}] dev-python/cherrypy[${PYTHON_USEDEP}] diff --git a/sys-cluster/ceph/ceph-17.2.5.ebuild b/sys-cluster/ceph/ceph-17.2.5-r1.ebuild similarity index 99% rename from sys-cluster/ceph/ceph-17.2.5.ebuild rename to sys-cluster/ceph/ceph-17.2.5-r1.ebuild index b743f6636743..133f0229b828 100644 --- a/sys-cluster/ceph/ceph-17.2.5.ebuild +++ b/sys-cluster/ceph/ceph-17.2.5-r1.ebuild @@ -149,7 +149,7 @@ RDEPEND=" sys-block/parted sys-fs/cryptsetup sys-fs/lsscsi - sys-fs/lvm2[-device-mapper-only(-)] + sys-fs/lvm2[lvm] virtual/awk dev-python/bcrypt[${PYTHON_USEDEP}] dev-python/cherrypy[${PYTHON_USEDEP}] diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r1.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r3.ebuild similarity index 98% rename from sys-fs/e2fsprogs/e2fsprogs-1.46.5-r1.ebuild rename to sys-fs/e2fsprogs/e2fsprogs-1.46.5-r3.ebuild index 8da61d9a0ff1..09e9ee84888f 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r1.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r3.ebuild @@ -17,7 +17,7 @@ RESTRICT="!test? ( test )" RDEPEND=" !sys-libs/${PN}-libs - cron? ( sys-fs/lvm2[-device-mapper-only(-)] ) + cron? ( sys-fs/lvm2[lvm] ) fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl ) tools? ( sys-apps/util-linux )" diff --git a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r2.ebuild b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild similarity index 98% rename from sys-fs/e2fsprogs/e2fsprogs-1.46.5-r2.ebuild rename to sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild index 37e0cf5c7af1..01be94e1f77e 100644 --- a/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r2.ebuild +++ b/sys-fs/e2fsprogs/e2fsprogs-1.46.5-r4.ebuild @@ -17,7 +17,7 @@ RESTRICT="!test? ( test )" RDEPEND=" !sys-libs/${PN}-libs - cron? ( sys-fs/lvm2[-device-mapper-only(-)] ) + cron? ( sys-fs/lvm2[lvm] ) fuse? ( sys-fs/fuse:0 ) nls? ( virtual/libintl ) tools? ( sys-apps/util-linux )" diff --git a/sys-fs/lvm2/lvm2-2.03.14-r3.ebuild b/sys-fs/lvm2/lvm2-2.03.14-r4.ebuild similarity index 91% rename from sys-fs/lvm2/lvm2-2.03.14-r3.ebuild rename to sys-fs/lvm2/lvm2-2.03.14-r4.ebuild index b0b0fa745cfe..b8512c8bc5ce 100644 --- a/sys-fs/lvm2/lvm2-2.03.14-r3.ebuild +++ b/sys-fs/lvm2/lvm2-2.03.14-r4.ebuild @@ -2,6 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + TMPFILES_OPTIONAL=1 inherit autotools linux-info systemd toolchain-funcs tmpfiles udev flag-o-matic @@ -13,8 +14,8 @@ SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux" -IUSE="readline static static-libs systemd lvm2create-initrd sanlock selinux +udev +thin device-mapper-only" -REQUIRED_USE="device-mapper-only? ( !lvm2create-initrd !sanlock !thin ) +IUSE="readline static static-libs systemd +lvm lvm2create-initrd sanlock selinux +udev +thin" +REQUIRED_USE="!lvm? ( !lvm2create-initrd !sanlock !thin ) static? ( !systemd !udev ) static-libs? ( static !udev ) systemd? ( udev )" @@ -34,7 +35,7 @@ RDEPEND="${DEPEND_COMMON} >=sys-apps/baselayout-2.2 >=sys-apps/util-linux-2.16 lvm2create-initrd? ( sys-apps/makedev ) - !device-mapper-only? ( virtual/tmpfiles ) + lvm? ( virtual/tmpfiles ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )" # note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check DEPEND="${DEPEND_COMMON} @@ -133,20 +134,20 @@ src_configure() { # The build options are tristate, and --without is NOT supported # options: 'none', 'internal', 'shared' myeconfargs+=( - $(use_enable !device-mapper-only dmfilemapd) - $(use_enable !device-mapper-only dmeventd) - $(use_enable !device-mapper-only cmdlib) - $(use_enable !device-mapper-only fsadm) - $(use_enable !device-mapper-only lvmpolld) - $(usex device-mapper-only --disable-udev-systemd-background-jobs '') + $(use_enable lvm dmfilemapd) + $(use_enable lvm dmeventd) + $(use_enable lvm cmdlib) + $(use_enable lvm fsadm) + $(use_enable lvm lvmpolld) + $(usex !lvm --disable-udev-systemd-background-jobs '') # This only causes the .static versions to become available $(usex static --enable-static_link '') # dmeventd requires mirrors to be internal, and snapshot available # so we cannot disable them - --with-mirrors="$(usex device-mapper-only none internal)" - --with-snapshots="$(usex device-mapper-only none internal)" + --with-mirrors="$(usex !lvm none internal)" + --with-snapshots="$(usex !lvm none internal)" # disable O_DIRECT support on hppa, breaks pv detection (#99532) $(usex hppa --disable-o_direct '') @@ -197,7 +198,7 @@ src_compile() { emake V=1 popd >/dev/null - if use device-mapper-only ; then + if use !lvm ; then emake V=1 device-mapper # https://bugs.gentoo.org/878131 emake -C libdm/dm-tools V=1 device-mapper @@ -217,13 +218,13 @@ src_install() { local INSTALL_TARGETS=( install install_tmpfiles_configuration ) # install systemd related files only when requested, bug #522430 use systemd && INSTALL_TARGETS+=( SYSTEMD_GENERATOR_DIR="$(systemd_get_systemgeneratordir)" install_systemd_units install_systemd_generators ) - use device-mapper-only && INSTALL_TARGETS=( install_device-mapper ) + use !lvm && INSTALL_TARGETS=( install_device-mapper ) emake V=1 DESTDIR="${D}" "${INSTALL_TARGETS[@]}" newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper - if use !device-mapper-only ; then + if use lvm ; then newinitd "${FILESDIR}"/dmeventd.initd-2.02.184-r2 dmeventd newinitd "${FILESDIR}"/lvm.rc-2.02.187 lvm newconfd "${FILESDIR}"/lvm.confd-2.02.184-r3 lvm @@ -244,7 +245,7 @@ src_install() { if use static-libs; then dolib.a libdm/ioctl/libdevmapper.a - if use !device-mapper-only; then + if use lvm; then # depends on lvmetad dolib.a libdaemon/client/libdaemonclient.a #462908 # depends on dmeventd @@ -267,7 +268,7 @@ src_install() { } pkg_postinst() { - if ! use device-mapper-only; then + if use lvm; then tmpfiles_process lvm2.conf fi diff --git a/sys-fs/lvm2/lvm2-2.03.16.ebuild b/sys-fs/lvm2/lvm2-2.03.16-r1.ebuild similarity index 73% rename from sys-fs/lvm2/lvm2-2.03.16.ebuild rename to sys-fs/lvm2/lvm2-2.03.16-r1.ebuild index cd7d14565326..70e6c17be7d5 100644 --- a/sys-fs/lvm2/lvm2-2.03.16.ebuild +++ b/sys-fs/lvm2/lvm2-2.03.16-r1.ebuild @@ -1,54 +1,57 @@ # Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 + TMPFILES_OPTIONAL=1 inherit autotools linux-info systemd toolchain-funcs tmpfiles udev flag-o-matic DESCRIPTION="User-land utilities for LVM2 (device-mapper) software" HOMEPAGE="https://sourceware.org/lvm2/"; -SRC_URI="https://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz - https://sourceware.org/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz"; +SRC_URI="https://sourceware.org/ftp/lvm2/${PN^^}.${PV}.tgz"; +S="${WORKDIR}/${PN^^}.${PV}" LICENSE="GPL-2" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" -IUSE="readline static static-libs systemd lvm2create-initrd sanlock selinux +udev +thin device-mapper-only" -REQUIRED_USE="device-mapper-only? ( !lvm2create-initrd !sanlock !thin ) +IUSE="+lvm lvm2create-initrd readline sanlock selinux static static-libs systemd +thin +udev" +REQUIRED_USE=" static? ( !systemd !udev ) static-libs? ( static !udev ) systemd? ( udev )" DEPEND_COMMON=" - dev-libs/libaio[static-libs?] - static? ( dev-libs/libaio[static-libs] ) - !static? ( dev-libs/libaio[static-libs?] ) - readline? ( sys-libs/readline:0= ) - sanlock? ( sys-cluster/sanlock ) - systemd? ( >=sys-apps/systemd-205:0= ) - udev? ( >=virtual/libudev-208:= )" + udev? ( virtual/libudev:= ) + lvm? ( + dev-libs/libaio + sys-apps/util-linux + readline? ( sys-libs/readline:= ) + sanlock? ( sys-cluster/sanlock ) + systemd? ( sys-apps/systemd:= ) + )" # /run is now required for locking during early boot. /var cannot be assumed to # be available -- thus, pull in recent enough baselayout for /run. # This version of LVM is incompatible with cryptsetup <1.1.2. RDEPEND="${DEPEND_COMMON} >=sys-apps/baselayout-2.2 - >=sys-apps/util-linux-2.16 - lvm2create-initrd? ( sys-apps/makedev ) - !device-mapper-only? ( virtual/tmpfiles ) - thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )" + lvm? ( + virtual/tmpfiles + lvm2create-initrd? ( sys-apps/makedev ) + thin? ( sys-block/thin-provisioning-tools ) + )" # note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check DEPEND="${DEPEND_COMMON} static? ( - readline? ( sys-libs/readline[static-libs] ) + lvm? ( + dev-libs/libaio[static-libs] + sys-apps/util-linux[static-libs] + readline? ( sys-libs/readline[static-libs] ) + ) selinux? ( sys-libs/libselinux[static-libs] ) - >=sys-apps/util-linux-2.16[static-libs] )" BDEPEND=" sys-devel/autoconf-archive - virtual/pkgconfig -" - -S="${WORKDIR}/${PN/lvm/LVM}.${PV}" + virtual/pkgconfig" PATCHES=( # Gentoo specific modification(s): @@ -72,6 +75,8 @@ PATCHES=( "${FILESDIR}"/${PN}-2.03.16-readelf.patch ) +QA_CONFIGURE_OPTIONS="--disable-static" + pkg_setup() { local CONFIG_CHECK="~SYSVIPC" @@ -114,7 +119,7 @@ src_prepare() { sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514 # Don't install thin man page when not requested - if ! use thin ; then + if ! use lvm || ! use thin ; then sed -i -e 's/^\(MAN7+=.*\) $(LVMTHINMAN) \(.*\)$/\1 \2/' man/Makefile.in || die fi @@ -133,26 +138,26 @@ src_configure() { # The build options are tristate, and --without is NOT supported # options: 'none', 'internal', 'shared' myeconfargs+=( - $(use_enable !device-mapper-only dmfilemapd) - $(use_enable !device-mapper-only dmeventd) - $(use_enable !device-mapper-only cmdlib) - $(use_enable !device-mapper-only fsadm) - $(use_enable !device-mapper-only lvmpolld) - $(usex device-mapper-only --disable-udev-systemd-background-jobs '') + $(use_enable lvm dmfilemapd) + $(use_enable lvm dmeventd) + $(use_enable lvm cmdlib) + $(use_enable lvm fsadm) + $(use_enable lvm lvmpolld) + $(usev !lvm --disable-udev-systemd-background-jobs) # This only causes the .static versions to become available - $(usex static --enable-static_link '') + $(usev static --enable-static_link) # dmeventd requires mirrors to be internal, and snapshot available # so we cannot disable them - --with-mirrors="$(usex device-mapper-only none internal)" - --with-snapshots="$(usex device-mapper-only none internal)" + --with-mirrors="$(usex lvm internal none)" + --with-snapshots="$(usex lvm internal none)" # disable O_DIRECT support on hppa, breaks pv detection (#99532) - $(usex hppa --disable-o_direct '') + $(usev hppa --disable-o_direct) ) - if use thin; then + if use lvm && use thin; then myeconfargs+=( --with-thin=internal --with-cache=internal ) local texec for texec in check dump repair restore; do @@ -181,7 +186,8 @@ src_configure() { $(use_enable udev udev_rules) $(use_enable udev udev_sync) $(use_with udev udevdir "${EPREFIX}$(get_udevdir)"/rules.d) - $(use_enable sanlock lvmlockd-sanlock) + # USE=sanlock requires USE=lvm + $(use_enable $(usex lvm sanlock lvm) lvmlockd-sanlock) $(use_enable systemd udev-systemd-background-jobs) $(use_enable systemd notify-dbus) --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" @@ -190,22 +196,19 @@ src_configure() { ) # Hard-wire this to bash as some shells (dash) don't know # "-o pipefail" #682404 - CONFIG_SHELL="/bin/bash" \ - econf "${myeconfargs[@]}" + CONFIG_SHELL="${BROOT}/bin/bash" econf "${myeconfargs[@]}" } src_compile() { - pushd include >/dev/null - emake V=1 - popd >/dev/null + emake V=1 -C include - if use device-mapper-only ; then + if use lvm ; then + emake V=1 + emake V=1 CC="$(tc-getCC)" -C scripts + else emake V=1 device-mapper # https://bugs.gentoo.org/878131 - emake -C libdm/dm-tools V=1 device-mapper - else - emake V=1 - emake V=1 CC="$(tc-getCC)" -C scripts #lvm2_activation_generator_systemd_red_hat + emake V=1 -C libdm/dm-tools device-mapper fi } @@ -215,17 +218,21 @@ src_test() { } src_install() { - local inst - local INSTALL_TARGETS=( install install_tmpfiles_configuration ) - # install systemd related files only when requested, bug #522430 - use systemd && INSTALL_TARGETS+=( SYSTEMD_GENERATOR_DIR="$(systemd_get_systemgeneratordir)" install_systemd_units install_systemd_generators ) - use device-mapper-only && INSTALL_TARGETS=( install_device-mapper ) + local INSTALL_TARGETS=( + # full LVM2 + $(usev lvm "install install_tmpfiles_configuration") + # install systemd related files only when requested, bug #522430 + $(usev $(usex lvm systemd lvm) "SYSTEMD_GENERATOR_DIR=$(systemd_get_systemgeneratordir) install_systemd_units install_systemd_generators") + + # install dm unconditionally + install_device-mapper + ) emake V=1 DESTDIR="${D}" "${INSTALL_TARGETS[@]}" newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper - if use !device-mapper-only ; then + if use lvm ; then newinitd "${FILESDIR}"/dmeventd.initd-2.02.184-r2 dmeventd newinitd "${FILESDIR}"/lvm.rc-2.02.187 lvm newconfd "${FILESDIR}"/lvm.confd-2.02.184-r3 lvm @@ -233,33 +240,33 @@ src_install() { # We keep the variable but remove udev from it. sed -r -i \ -e '/^rc_need=/s/\<udev\>//g' \ - "${ED}/etc/conf.d/lvm" || die "Could not drop udev from rc_need" + "${ED}"/etc/conf.d/lvm || die "Could not drop udev from rc_need" fi newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring newinitd "${FILESDIR}"/lvmpolld.initd-2.02.183 lvmpolld - fi - if use sanlock; then - newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd + if use lvm2create-initrd; then + dosbin scripts/lvm2create_initrd/lvm2create_initrd + doman scripts/lvm2create_initrd/lvm2create_initrd.8 + newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd + fi + + if use sanlock; then + newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd + fi fi if use static-libs; then dolib.a libdm/ioctl/libdevmapper.a - if use !device-mapper-only; then + if use lvm; then # depends on lvmetad dolib.a libdaemon/client/libdaemonclient.a #462908 # depends on dmeventd dolib.a daemons/dmeventd/libdevmapper-event.a fi else - rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a - fi - - if use lvm2create-initrd; then - dosbin scripts/lvm2create_initrd/lvm2create_initrd - doman scripts/lvm2create_initrd/lvm2create_initrd.8 - newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd + rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a || die fi insinto /etc @@ -269,9 +276,7 @@ src_install() { } pkg_postinst() { - if ! use device-mapper-only; then - tmpfiles_process lvm2.conf - fi + use lvm && tmpfiles_process lvm2.conf if use udev; then udev_reload diff --git a/sys-fs/lvm2/metadata.xml b/sys-fs/lvm2/metadata.xml index 1f13a2e87d3b..58bb7db61599 100644 --- a/sys-fs/lvm2/metadata.xml +++ b/sys-fs/lvm2/metadata.xml @@ -13,7 +13,7 @@ <use> <flag name="lvm2create-initrd">Install lvm2create_initrd script and pull in <pkg>sys-apps/makedev</pkg> for the /sbin/MAKEDEV command</flag> <flag name="thin">Support for thin volumes</flag> - <flag name="device-mapper-only">Build only device-mapper and not the rest of LVM2 (UNSUPPORTED)</flag> + <flag name="lvm">Build all of LVM2, not just device-mapper</flag> <flag name="sanlock">Enable lvmlockd with support for sanlock</flag> </use> <upstream>
