diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-09-06 16:26:18 +0100 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-09-06 16:26:18 +0100 |
commit | 3221bf225fb68a31e281fcdbfde4cea0d576d946 (patch) | |
tree | 63e4f978840b705bebc18062b4d599ae75fd32e1 /sys-fs | |
parent | 64b277f858d171900cba8a53e675ef8c3ff893fc (diff) |
gentoo auto-resync : 06:09:2023 - 16:26:18
Diffstat (limited to 'sys-fs')
-rw-r--r-- | sys-fs/Manifest.gz | bin | 22564 -> 22568 bytes | |||
-rw-r--r-- | sys-fs/lvm2/Manifest | 5 | ||||
-rw-r--r-- | sys-fs/lvm2/lvm2-2.03.21-r1.ebuild (renamed from sys-fs/lvm2/lvm2-2.03.21.ebuild) | 2 | ||||
-rw-r--r-- | sys-fs/lvm2/lvm2-2.03.22-r1.ebuild (renamed from sys-fs/lvm2/lvm2-2.03.22.ebuild) | 2 | ||||
-rw-r--r-- | sys-fs/lvm2/lvm2-2.03.22-r2.ebuild | 303 |
5 files changed, 308 insertions, 4 deletions
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz Binary files differindex dfb2751add4b..2af72f6a9b1c 100644 --- a/sys-fs/Manifest.gz +++ b/sys-fs/Manifest.gz diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest index 9b4457d4f494..e1651f79c4fd 100644 --- a/sys-fs/lvm2/Manifest +++ b/sys-fs/lvm2/Manifest @@ -13,6 +13,7 @@ AUX lvmlockd.initd-r2 390 BLAKE2B aebfa2a654eca784da24fd4e4d46b3e6c97256a42b725e AUX lvmpolld.initd-r1 348 BLAKE2B cba0419add6591320dc60ef7616b66706e042b566284a4ec42002fbb5331a7173fc8b4b39be7198426fe4bbdcd3ad94b69fc3d8950705b6331c5f3f4cda4ad66 SHA512 b9b8376cbc8b6703868afab18e5baa4ef5354569e57f0596d38a8005fa725299f6858ac86b39fcca10e5a0f1adbd3a4cfa6cc6b62405e78916cc1287d8b36d0d DIST LVM2.2.03.21.tgz 2742294 BLAKE2B 529bc01b3d1ba6207c9ddc95309b39e6293fcd0286334240b9fdc076da0b7bc7e026338ec0243564ec153f2fb5009014149c3f8e0db0cd47a29418af62068728 SHA512 6024811c3fa92afd2fc13a10d1c3542352aa9a016f40c3ef588bd2f5f3e41245fed4b36c8a87d9f7f8dddc6e13b7253396f5c811f99665df27751676dc7b5bde DIST LVM2.2.03.22.tgz 2755031 BLAKE2B 79bbea84bd82f111c1bb5de336e6a9f1368b2c9e43f075dccaa90c7746a364259ad278adf650379eca75f2803ed74e74dd372be2cca8518462182657f96a0033 SHA512 17cd24ceee8026481566824b688dafd03ec816201d5cb3549cb7fc8a36f4cdaa982faaef4dcd26debfe775dea5ffa2744798164314ea6dc99a84f8ccccfc33ff -EBUILD lvm2-2.03.21.ebuild 8610 BLAKE2B 78f95123447f283ff7925ac0b7bd17ced195a330272f8cd9e493602184cee1ec6c2e99b960e4427d41733905fe39b0cf63b41458067820d4db01a15be4d24214 SHA512 b336782a48aec9c21933b8eab68773395c715e3f08c7015d2e986ad5bb6c6d488d3e37c72c3976c401062ebff73e31679e7d8d577fe1c90cf7d9089bd08f00eb -EBUILD lvm2-2.03.22.ebuild 8618 BLAKE2B 8c766adf841c6935c363892193239949820385ab69e83891f52c73584bd21bfb5bb6a1f610a1f850374e4801fdb8e1ce0ad5413c4b51e304e0518b4b7fdd7e54 SHA512 d0db3aec3ebf6d06f35099490c0045633083be1cda68ced833bd76b6eec657f457fd0d0743353228d23710da389a62fc9accc4f4075f6754adc1866028733eda +EBUILD lvm2-2.03.21-r1.ebuild 8617 BLAKE2B 29c10c7d598b13a637007b9a7b3f8bb214dd067b21a815bf84c6316bdc478047b8001e11b5fcaf8ba82e02a19a5ce67411ab3cc2ddcd5e8ca4f35cb351a9032a SHA512 992b9767fbfed1632473e61dfd2bf95d35286c5327e30852e04b796076372fd453eb958e8601deb5594e86cd3cadf9b45bee829a6d9bca256e3c680c9ac3ceee +EBUILD lvm2-2.03.22-r1.ebuild 8625 BLAKE2B 4dbf6f6bdf75d09ada20cbe743c22eeeef266880b012317d5f232b0db0c808861f6768a4b4e4ad11c0c010b67a0a449a5985850826404023d0dca1323b85920f SHA512 f0d6300b85d305a04e4f25ea947dc9e693f9a3e3cdec70f9b7e0834a0da4bf472512bd2bf5a38b79d8dd9d6f8e6967dd429a5e94806e9c56eb3c02f7b6c8a539 +EBUILD lvm2-2.03.22-r2.ebuild 8576 BLAKE2B a5b00189329589c1d4e3d6dba81bf1ce60f1813282992a28004239735c80994e175cfd52b372248bdac9c889bf72a533dd86a8416f5d836c80e36e94f5c50a21 SHA512 a7d05b6d5215b12c26932010bc6e898568bb52a31c222c3d460a2c5e6a6f1be97608aaa6ba3bfd289bd9bf5c26e3187d6f3c5e5ef226fd7637616ac287610787 MISC metadata.xml 831 BLAKE2B c34345ee897004b3776da0cb65cb1165156ecaf1802926f1b8d77eb25c836cebbb1833fadb0af3580b127c7852ac561ac20c877bcfd0cc80ea3b6283ed1ce975 SHA512 0be91bba800fc1db6dbad68e36b7d882a6bd41124a10e759322ccc661d123a689a2c0ea5f3fa2dfa40ae197c36b3171cb99d6630967805d57aa220543f0a1623 diff --git a/sys-fs/lvm2/lvm2-2.03.21.ebuild b/sys-fs/lvm2/lvm2-2.03.21-r1.ebuild index 3c242d428277..f51ecb233a38 100644 --- a/sys-fs/lvm2/lvm2-2.03.21.ebuild +++ b/sys-fs/lvm2/lvm2-2.03.21-r1.ebuild @@ -40,7 +40,7 @@ RDEPEND=" >=sys-apps/baselayout-2.2 lvm? ( virtual/tmpfiles - thin? ( sys-block/thin-provisioning-tools ) + thin? ( <sys-block/thin-provisioning-tools-1.0.0 ) ) " # note: thin-0.3.0 is required to avoid --disable-thin_check_needs_check diff --git a/sys-fs/lvm2/lvm2-2.03.22.ebuild b/sys-fs/lvm2/lvm2-2.03.22-r1.ebuild index 70401a720982..263e01250962 100644 --- a/sys-fs/lvm2/lvm2-2.03.22.ebuild +++ b/sys-fs/lvm2/lvm2-2.03.22-r1.ebuild @@ -40,7 +40,7 @@ RDEPEND=" >=sys-apps/baselayout-2.2 lvm? ( virtual/tmpfiles - thin? ( sys-block/thin-provisioning-tools ) + thin? ( <sys-block/thin-provisioning-tools-1.0.0 ) ) " # note: thin-0.3.0 is required to avoid --disable-thin_check_needs_check diff --git a/sys-fs/lvm2/lvm2-2.03.22-r2.ebuild b/sys-fs/lvm2/lvm2-2.03.22-r2.ebuild new file mode 100644 index 000000000000..4f1e24d663d0 --- /dev/null +++ b/sys-fs/lvm2/lvm2-2.03.22-r2.ebuild @@ -0,0 +1,303 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +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/ftp/lvm2/${PN^^}.${PV}.tgz" +S="${WORKDIR}/${PN^^}.${PV}" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +IUSE="lvm readline sanlock selinux static static-libs systemd thin +udev valgrind" +REQUIRED_USE=" + static? ( !systemd !udev ) + static-libs? ( static !udev ) + systemd? ( udev ) + thin? ( lvm ) +" + +DEPEND_COMMON=" + 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 + lvm? ( + virtual/tmpfiles + thin? ( >=sys-block/thin-provisioning-tools-1.0.6 ) + ) +" +# note: thin-0.3.0 is required to avoid --disable-thin_check_needs_check +DEPEND=" + ${DEPEND_COMMON} + static? ( + lvm? ( + dev-libs/libaio[static-libs] + sys-apps/util-linux[static-libs] + readline? ( sys-libs/readline[static-libs] ) + ) + selinux? ( sys-libs/libselinux[static-libs] ) + ) + valgrind? ( >=dev-util/valgrind-3.6 ) +" +BDEPEND=" + sys-devel/autoconf-archive + virtual/pkgconfig +" + +PATCHES=( + # Gentoo specific modification(s): + "${FILESDIR}"/${PN}-2.03.20-example.conf.in.patch + + # For upstream -- review and forward: + "${FILESDIR}"/${PN}-2.03.20-dmeventd-no-idle-exit.patch + "${FILESDIR}"/${PN}-2.03.20-freopen-musl.patch +) + +pkg_setup() { + local CONFIG_CHECK="~SYSVIPC" + + if use udev; then + local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n" + if linux_config_exists; then + local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH) + if [[ -n "${uevent_helper_path}" ]] && [[ "${uevent_helper_path}" != '""' ]]; then + ewarn "It's recommended to set an empty value to the following kernel config option:" + ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}" + fi + fi + fi + + check_extra_config + + # 1. Genkernel no longer copies /sbin/lvm blindly. + if use static; then + elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with" + elog "their static versions. If you need the static binaries," + elog "you must append .static to the filename!" + fi +} + +src_prepare() { + default + + # Users without systemd get no auto-activation of any logical volume + if ! use systemd ; then + eapply "${FILESDIR}"/${PN}-2.03.20-dm_lvm_rules_no_systemd.patch + fi + + eautoreconf +} + +src_configure() { + filter-lto + + # Workaround for bug #822210 + tc-ld-disable-gold + + # Most of this package does weird stuff. + # The build options are tristate, and --without is NOT supported + # options: 'none', 'internal', 'shared' + local myeconfargs=( + $(use_enable lvm dmfilemapd) + $(use_enable lvm dmeventd) + $(use_enable lvm cmdlib) + $(use_enable lvm fsadm) + $(use_enable lvm lvmpolld) + + # This only causes the .static versions to become available + $(usev static --enable-static_link) + + # dmeventd requires mirrors to be internal, and snapshot available + # so we cannot disable them + --with-mirrors="$(usex lvm internal none)" + --with-snapshots="$(usex lvm internal none)" + ) + + if use lvm && use thin; then + myeconfargs+=( --with-thin=internal --with-cache=internal ) + local texec + for texec in check dump repair restore; do + myeconfargs+=( --with-thin-${texec}="${EPREFIX}"/sbin/thin_${texec} ) + myeconfargs+=( --with-cache-${texec}="${EPREFIX}"/sbin/cache_${texec} ) + done + else + myeconfargs+=( --with-thin=none --with-cache=none ) + fi + + myeconfargs+=( + # musl doesn't do symbol versioning so can end up with + # runtime breakage. + --with-symvers=$(usex elibc_glibc 'gnu' 'no') + $(use_enable readline) + $(use_enable selinux) + --enable-pkgconfig + --with-confdir="${EPREFIX}"/etc + --exec-prefix="${EPREFIX}" + --sbindir="${EPREFIX}/sbin" + --with-staticdir="${EPREFIX}"/sbin + --libdir="${EPREFIX}/$(get_libdir)" + --with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" + --with-default-dm-run-dir=/run + --with-default-run-dir=/run/lvm + --with-default-locking-dir=/run/lock/lvm + --with-default-pid-dir=/run + $(use_enable udev udev_rules) + $(use_enable udev udev_sync) + $(use_with udev udevdir "${EPREFIX}$(get_udevdir)"/rules.d) + # USE=sanlock requires USE=lvm + $(use_enable $(usex lvm sanlock lvm) lvmlockd-sanlock) + $(use_enable systemd notify-dbus) + $(use_enable systemd app-machineid) + $(use_enable systemd systemd-journal) + $(use_with systemd systemd-run "/usr/bin/systemd-run") + $(use_enable valgrind valgrind-pool) + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + CLDFLAGS="${LDFLAGS}" + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + emake V=1 -C include + + 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 V=1 -C libdm/dm-tools device-mapper + fi +} + +src_test() { + einfo "Tests are disabled because of device-node mucking, if you want to" + einfo "run tests, compile the package and see ${S}/tests" +} + +src_install() { + 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-r3 device-mapper + newconfd "${FILESDIR}"/device-mapper.conf-r4 device-mapper + + if use lvm ; then + newinitd "${FILESDIR}"/dmeventd.initd-r3 dmeventd + newinitd "${FILESDIR}"/lvm.rc-r1 lvm + newconfd "${FILESDIR}"/lvm.confd-r4 lvm + if ! use udev ; then + # 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" + fi + + newinitd "${FILESDIR}"/lvm-monitoring.initd-r3 lvm-monitoring + newinitd "${FILESDIR}"/lvmpolld.initd-r1 lvmpolld + + if use sanlock; then + newinitd "${FILESDIR}"/lvmlockd.initd-r2 lvmlockd + fi + fi + + if use static-libs; then + dolib.a libdm/ioctl/libdevmapper.a + 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 || die + fi + + insinto /etc + doins "${FILESDIR}"/dmtab + + dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf +} + +pkg_preinst() { + HAD_LVM=0 + + if has_version 'sys-fs/lvm2[lvm(+)]' ; then + HAD_LVM=1 + fi +} + +pkg_postinst() { + use lvm && tmpfiles_process lvm2.conf + use udev && udev_reload + + # This is a new installation + if [[ -z "${REPLACING_VERSIONS}" ]]; then + if use lvm ; then + ewarn "Make sure the \"lvm\" init script is in the runlevels:" + ewarn "# rc-update add lvm boot" + ewarn + ewarn "Make sure to enable lvmetad in ${EROOT}/etc/lvm/lvm.conf if you want" + ewarn "to enable lvm autoactivation and metadata caching." + else + ewarn "Please enable USE=lvm if you need the LVM daemon and" + ewarn "tools like 'lvchange', 'vgchange', etc!" + fi + else + if ! use lvm && [[ ${HAD_LVM} -eq 1 ]] ; then + ewarn "LVM was previously enabled but is now disabled." + ewarn "Please enable USE=lvm if you need the LVM daemon and" + ewarn "tools like 'lvchange', 'vgchange', etc!" + ewarn "See the 2022-11-19-lvm2-default-USE-flags news item for more details." + fi + fi + + if use udev && [[ -d /run ]] ; then + local permission_run_expected="drwxr-xr-x" + local permission_run=$(stat -c "%A" /run) + if [[ "${permission_run}" != "${permission_run_expected}" ]] ; then + ewarn "Found the following problematic permissions:" + ewarn "" + ewarn " ${permission_run} /run" + ewarn "" + ewarn "Expected:" + ewarn "" + ewarn " ${permission_run_expected} /run" + ewarn "" + ewarn "This is known to cause problems for udev-enabled LVM services." + fi + fi +} + +pkg_postrm() { + if use udev && [[ -z ${REPLACED_BY_VERSION} ]]; then + udev_reload + fi +} |