diff options
Diffstat (limited to 'sys-fs/lvm2')
| -rw-r--r-- | sys-fs/lvm2/Manifest | 6 | ||||
| -rw-r--r-- | sys-fs/lvm2/lvm2-2.03.14-r4.ebuild (renamed from sys-fs/lvm2/lvm2-2.03.14-r3.ebuild) | 33 | ||||
| -rw-r--r-- | sys-fs/lvm2/lvm2-2.03.16-r1.ebuild (renamed from sys-fs/lvm2/lvm2-2.03.16.ebuild) | 137 | ||||
| -rw-r--r-- | sys-fs/lvm2/metadata.xml | 2 |
4 files changed, 92 insertions, 86 deletions
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest index 73b30d3f96d0..da46a1d8daff 100644 --- a/sys-fs/lvm2/Manifest +++ b/sys-fs/lvm2/Manifest @@ -29,6 +29,6 @@ AUX lvmlockd.initd-2.02.166-r1 390 BLAKE2B aebfa2a654eca784da24fd4e4d46b3e6c9725 AUX lvmpolld.initd-2.02.183 348 BLAKE2B cba0419add6591320dc60ef7616b66706e042b566284a4ec42002fbb5331a7173fc8b4b39be7198426fe4bbdcd3ad94b69fc3d8950705b6331c5f3f4cda4ad66 SHA512 b9b8376cbc8b6703868afab18e5baa4ef5354569e57f0596d38a8005fa725299f6858ac86b39fcca10e5a0f1adbd3a4cfa6cc6b62405e78916cc1287d8b36d0d DIST LVM2.2.03.14.tgz 2639538 BLAKE2B 806f5e9cb76a05febef6f8ce8cfc42c92927b9538f62a21029c5ffc426a4fd7c3f32709be08dbd8028b53891b1075d1d13cb3b0d7b1815071ee8eb927d8f3ed3 SHA512 6a93bed1d5cf36f0f48d4d413d028b0e480cd4fc20e25d173770a892f265d2a0cc68d01a720b1513469953649e989532cd0c45f9538f92a4190eb3dc4555857d DIST LVM2.2.03.16.tgz 2658805 BLAKE2B 05c6089adff0c61ff1281a05a917f75480ad4acc28cb0214a42589d206a61168f68de07891b9af9814ed7998f16aff6f29ba29b85b23de36f38bf3b5f27802c1 SHA512 084ba4080537359458db936637fc7f83bb9bfcf2de9f3660882551b5c31c7e9900c7d381b238ce1bb7629942c740c121f0dea5e404c302d31ed028b5c65efaa5 -EBUILD lvm2-2.03.14-r3.ebuild 9996 BLAKE2B 6b362736c095df126b9b6ebcea21cec474f0b194cf186b7af2568820cfb2521accdaa5f4247cb5a205190c741ca866bfc409cede0b814ac12a3c1e1003df60fd SHA512 a5931ee69d8a3fb9d32ad7e8fe91c9a9d07224f4b220e1b5a6dce290ea73c87eeb125ddc0c466c7bd4aa854f8c98af4a0e7d878f6a0be101dda6288f3f63760e -EBUILD lvm2-2.03.16.ebuild 10055 BLAKE2B 86b12b246425bd349ede5dd62e54bd1251343fffd558ccd3bfb7f5cb246c36f6ec85ca98793ea4c749bdc9c755ee1b54edebf22ddc9dab1ed2a45984ba264828 SHA512 b6bcb929f0d40a87afda4a7e9e60accdf444c32190074bd4942214454d56153d1504dd26a26b37852952574b78f715f0e351a9ac5e217d1c7747d9f5a1230467 -MISC metadata.xml 976 BLAKE2B 62a8892f78c85315386a5d52acbc2eddc957e9dcceba6b762e57a2229f78648a1e5ec3b1adc3eeecda3c0730a23c83ff3e08c4eef374a06cbfef2463fc053115 SHA512 4c058826b51181cd230b813390fd11d30697e2ff352d6af5ba576f30c35703c336c5390663d7aeb6e74203b9d457d45d3079fad88a79d89b21272b07a21f7e39 +EBUILD lvm2-2.03.14-r4.ebuild 9754 BLAKE2B fb0bc82154959383aebdb494229f521c39fdb1fcd9efd44ed43257456610cfe3cc1822878ff929eaacb4b5aea6f2fbb8acdb5c7a388066ec547933cc9d2e4fb0 SHA512 8a266fbee2cf9ee8e48be42a415483f37a4ea3959c7d6e8e7118d13ebc3f7dbb0d6858f3714f292947affa3a1914df08d22d58d637d87bd6b9943d27ff8fe593 +EBUILD lvm2-2.03.16-r1.ebuild 9680 BLAKE2B 5205dad55e1b3c698c5c5df2e3180ccc6efd1f96d06999da9900cbed699287a65fc32140ff21c976acac39a49d347e8f1d10421a3dfbb977119ca3a898e6c7aa SHA512 38189585f7fb88bebfcfae78c098308c39c204db97c96894a1a62170de53229d865c8664b95cfe1dbf89b84aee083072d845fcfff259f6cbfb65d2e8e507809b +MISC metadata.xml 939 BLAKE2B a3f004d1454fd139e640d70d7e53b472faa4f70f1b7b7b015a85ddd15766746ed89d0691ab8988b826d50d384d9be689dc5c2162358255c86fe24056c06acd55 SHA512 4bbc76d6ab664633ad7306965a430ae7071f3822e5dcc55d102ab19f2a853ead2c33144372892e38c51c264ca3e2ff7bcf4765105a7e7960fb5c835879e81621 diff --git a/sys-fs/lvm2/lvm2-2.03.14-r3.ebuild b/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 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> |