From 71dd9d29cdaf7cc0ecdb9ea37d128726a941c630 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 23 Nov 2024 03:02:57 +0000 Subject: gentoo auto-resync : 23:11:2024 - 03:02:56 --- sys-fs/lvm2/Manifest | 3 +- sys-fs/lvm2/files/lvm2-2.03.22-basename-musl.patch | 34 +++ sys-fs/lvm2/lvm2-2.03.22-r6.ebuild | 316 -------------------- sys-fs/lvm2/lvm2-2.03.22-r7.ebuild | 317 +++++++++++++++++++++ 4 files changed, 353 insertions(+), 317 deletions(-) create mode 100644 sys-fs/lvm2/files/lvm2-2.03.22-basename-musl.patch delete mode 100644 sys-fs/lvm2/lvm2-2.03.22-r6.ebuild create mode 100644 sys-fs/lvm2/lvm2-2.03.22-r7.ebuild (limited to 'sys-fs/lvm2') diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest index 439f6deec95d..a4d6bfc93ff2 100644 --- a/sys-fs/lvm2/Manifest +++ b/sys-fs/lvm2/Manifest @@ -10,6 +10,7 @@ AUX lvm2-2.03.20-dmeventd-no-idle-exit.patch 2174 BLAKE2B e5b53504feeac84e045839 AUX lvm2-2.03.20-example.conf.in.patch 1317 BLAKE2B dee2843e512bb16e4d64c7e76141133222c46a7b6776418f19af56139ed0764401cc8b49be06d18358f3e32277fbcc34b644e8e4e104a8eca25eb6f90e2b362d SHA512 1d724b75e441bd7ff0836ab1ae685401817aeccfc5c312c7ce73b3ef70bf4413829f7e07f13399cae6d7085503eaf8566df936fc79185ef9d6f9ad773fcc9fef AUX lvm2-2.03.20-freopen-musl.patch 1595 BLAKE2B 4e019fbf8b89f79ca19eb821bc434d84d5c986a10d82b4a33a3cc4b8b6aa30c27e912e2ab0d067cab94feb28b53826725f43dd0973a60482c20e6417149b6a35 SHA512 40e49bb34a9c07493ab6a9948e3ac1a85e22f069b69ad2a1369cb7d30a6ea6d72a27f380ad8951f55d939834e2f29c9da589ae475322ea41b4dfce72060b9557 AUX lvm2-2.03.22-autoconf-2.72-egrep.patch 841 BLAKE2B 89f2e2766fc915091292d4e19e9ba6cdda424ff1a6d160faaf0a62fa7156ddcfd47b36ce34df5981eb91db28f5ae2755a0a67c73bce86962f455ad73289885c7 SHA512 8e8218c628e617896456caafa3f83d4a95e54bd1edd9f0e003b3f922bab2935e16d19f18b6f2514c7f7b70d3ad54787669cd3e8b9770d2f1d0a8963c759b6520 +AUX lvm2-2.03.22-basename-musl.patch 1190 BLAKE2B d2ded013a6e6cd0c99202d0cdfcbbf241d4583567359e4c7189b3ae17fb4040dc50159988e74c439df978a0bb6e20f4caadaa2a55f3405eea28630813e26499b SHA512 f1bf0b6924717e9772fa3d33c843b402eb05ffa5b11897d7c591d8565a2c1b9f516b8f9cf7e84c1c2ba67f6ee5a0ee8c4487ee565248a30cb495ae97c9a610b2 AUX lvm2-2.03.22-thin-autodetect.patch 6106 BLAKE2B 0707e8bcacf33a88eac8c77cad75d96b90988ccb39966f673a115b09fb025e89e62b472b5e5c8257e5d30938584c1df3bdd113cec890a05006e031240209b515 SHA512 ea2874a544ac104219e34e00f016b201f1dc27f632c9d83d6780c4a5d1461924929fde92469e7d40a23f727cc1b024a039f61d30a41b7b465e3f813d3620d643 AUX lvm2-2.03.22-thin-version-checking.patch 2619 BLAKE2B ce32b0b0dd8d7036784b100d4b7daf7eeffb2aa94db22a1bb4a7f809c77eab3baa33d1ea114be0aed0071349fc8299ec1330213da9639e262ace536b8849e966 SHA512 f5a93f85b4be3d133c30163acab90000190c50b1070619d308eb31ace8136145053e9020964459f779d4dc1b3bf9f3bcc61f74d00c5ce176b9cd695bd048025c AUX lvmlockd.initd-r2 390 BLAKE2B aebfa2a654eca784da24fd4e4d46b3e6c97256a42b725e015a13c9673e79c0d1a10213d1eecb6c75d4ce1ebd99e6200010f19c36d758018bdef303ea08ee5549 SHA512 6359b3cbff1fa05944fb69582234220cac593b2c8f8317162a728bac72ced4f8b492ce11e6ced6d848a7654fa4a506c1e658f546cff302344a739646479a62dc @@ -18,5 +19,5 @@ DIST LVM2.2.03.21.tgz 2742294 BLAKE2B 529bc01b3d1ba6207c9ddc95309b39e6293fcd0286 DIST LVM2.2.03.22.tgz 2755031 BLAKE2B 79bbea84bd82f111c1bb5de336e6a9f1368b2c9e43f075dccaa90c7746a364259ad278adf650379eca75f2803ed74e74dd372be2cca8518462182657f96a0033 SHA512 17cd24ceee8026481566824b688dafd03ec816201d5cb3549cb7fc8a36f4cdaa982faaef4dcd26debfe775dea5ffa2744798164314ea6dc99a84f8ccccfc33ff EBUILD lvm2-2.03.21-r1.ebuild 8612 BLAKE2B a5adec8263b994e58610e51c17ecef378d0da54c5f9ee83de959c7d53e67850afc8b74297f342915d4ccc6138f35630e7b4c832e0d7d198f0a040c052b4f9157 SHA512 b589a726b5dfe66bf2861e48ece483d774a86d373ee58859b393114c719a9511c418d5fd24204ab1674e4ae88f393bf342ee6e83f282f1356f35a192693d8ed7 EBUILD lvm2-2.03.22-r1.ebuild 8572 BLAKE2B b03926843eb2baaed25fcf7b4f607163b18a2a8bfac59a2707b09d80ac49704ea737e40c9d083905b7fb02bad2de35aee853eee9c3423fb5d0fa7a6f6c052ba5 SHA512 993ad760ff582b8776c92f910c0eab3f015460240ec5ee77af743a4c9741c572ec2540af286287fc252b52c0f2950e5433af51d3e1ae616c3445c0a10464f7d4 -EBUILD lvm2-2.03.22-r6.ebuild 8809 BLAKE2B d730e73e772e54e78ec66011d64a1a3f72aeb33ad1746a30715fca68d7924b5c4038d9be08384404cca673536627799f4e1c4a95970f3cd3ede7574b6360d5dd SHA512 4eee1169ff8bd8d724e3a54a768f1373c633d6ee8b39aea15a744c9fe840c38c752564fe078e798f4e5bcef497bd4f6fb1801fae20a70ed85f244609ea2c4ee2 +EBUILD lvm2-2.03.22-r7.ebuild 8858 BLAKE2B 9a04ed4995193be6550b509567bdae4d8375b8ed792746d2c6194d1eccb9c11d5c2c9eb2a0f074ba6fb1ad2afa583b08d7337ea0aaeb3256c3398f7420aeb05d SHA512 3b5dfb312456631c01f7055b918956318e48a44d641e55cfbb7be8179e443bb815fc2021107721637e7ddc8277163ad7987d1f333decd7249359c982549553b8 MISC metadata.xml 831 BLAKE2B c34345ee897004b3776da0cb65cb1165156ecaf1802926f1b8d77eb25c836cebbb1833fadb0af3580b127c7852ac561ac20c877bcfd0cc80ea3b6283ed1ce975 SHA512 0be91bba800fc1db6dbad68e36b7d882a6bd41124a10e759322ccc661d123a689a2c0ea5f3fa2dfa40ae197c36b3171cb99d6630967805d57aa220543f0a1623 diff --git a/sys-fs/lvm2/files/lvm2-2.03.22-basename-musl.patch b/sys-fs/lvm2/files/lvm2-2.03.22-basename-musl.patch new file mode 100644 index 000000000000..2dd9f8ff524c --- /dev/null +++ b/sys-fs/lvm2/files/lvm2-2.03.22-basename-musl.patch @@ -0,0 +1,34 @@ +https://bugs.gentoo.org/937239 +https://github.com/lvmteam/lvm2/commit/f98d2ffe8753895c84160a7abce4223bd127cd9e + +From f98d2ffe8753895c84160a7abce4223bd127cd9e Mon Sep 17 00:00:00 2001 +From: Zdenek Kabelac +Date: Wed, 27 Mar 2024 00:28:14 +0100 +Subject: [PATCH] device_id: use dm_basename + +Avoid problems for other libc like muslc and use dm_basename. + +Prototype for basename has been removed from string.h from latest musl [1] +compilers e.g. clang-18 flags the absense of prototype as error. therefore +include libgen.h for providing it. + +[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 + +Reported-by: Khem Raj +--- + lib/device/device_id.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/device/device_id.c b/lib/device/device_id.c +index 7d67a1cb7..200d39432 100644 +--- a/lib/device/device_id.c ++++ b/lib/device/device_id.c +@@ -740,7 +740,7 @@ static int _dev_read_sys_serial(struct cmd_context *cmd, struct device *dev, + int ret; + + /* /dev/vda to vda */ +- base = basename(devname); ++ base = dm_basename(devname); + + /* vda1 to vda */ + for (i = 0; i < strlen(base); i++) { diff --git a/sys-fs/lvm2/lvm2-2.03.22-r6.ebuild b/sys-fs/lvm2/lvm2-2.03.22-r6.ebuild deleted file mode 100644 index 28276a453367..000000000000 --- a/sys-fs/lvm2/lvm2-2.03.22-r6.ebuild +++ /dev/null @@ -1,316 +0,0 @@ -# Copyright 1999-2024 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="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc 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 ) -" - -PDEPEND=" - lvm? ( - 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? ( - sys-apps/util-linux[static-libs] - lvm? ( - dev-libs/libaio[static-libs] - readline? ( sys-libs/readline[static-libs] ) - ) - selinux? ( sys-libs/libselinux[static-libs] ) - ) - valgrind? ( >=dev-debug/valgrind-3.6 ) -" -BDEPEND=" - dev-build/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 - "${FILESDIR}"/${PN}-2.03.22-autoconf-2.72-egrep.patch - "${FILESDIR}"/${PN}-2.03.22-thin-version-checking.patch - "${FILESDIR}"/${PN}-2.03.22-thin-autodetect.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 - --enable-thin_check_needs_check - --with-cache=internal - --enable-cache_check_needs_check - ) - local texec - for texec in check dump repair restore; do - myeconfargs+=( --with-thin-${texec}="${EPREFIX}"/usr/sbin/thin_${texec} ) - myeconfargs+=( --with-cache-${texec}="${EPREFIX}"/usr/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 targets=() - if use lvm; then - targets+=( install install_tmpfiles_configuration ) - if use systemd; then - # install systemd related files only when requested, bug #522430 - targets+=( install_systemd_units ) - fi - else - targets+=( install_device-mapper ) - fi - - # -j1 for bug #918125 - emake -j1 V=1 DESTDIR="${D}" "${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/\//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 -} diff --git a/sys-fs/lvm2/lvm2-2.03.22-r7.ebuild b/sys-fs/lvm2/lvm2-2.03.22-r7.ebuild new file mode 100644 index 000000000000..ac084f2eed9c --- /dev/null +++ b/sys-fs/lvm2/lvm2-2.03.22-r7.ebuild @@ -0,0 +1,317 @@ +# Copyright 1999-2024 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="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc 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 ) +" + +PDEPEND=" + lvm? ( + 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? ( + sys-apps/util-linux[static-libs] + lvm? ( + dev-libs/libaio[static-libs] + readline? ( sys-libs/readline[static-libs] ) + ) + selinux? ( sys-libs/libselinux[static-libs] ) + ) + valgrind? ( >=dev-debug/valgrind-3.6 ) +" +BDEPEND=" + dev-build/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 + "${FILESDIR}"/${PN}-2.03.22-autoconf-2.72-egrep.patch + "${FILESDIR}"/${PN}-2.03.22-thin-version-checking.patch + "${FILESDIR}"/${PN}-2.03.22-thin-autodetect.patch + "${FILESDIR}"/${PN}-2.03.22-basename-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 + --enable-thin_check_needs_check + --with-cache=internal + --enable-cache_check_needs_check + ) + local texec + for texec in check dump repair restore; do + myeconfargs+=( --with-thin-${texec}="${EPREFIX}"/usr/sbin/thin_${texec} ) + myeconfargs+=( --with-cache-${texec}="${EPREFIX}"/usr/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 targets=() + if use lvm; then + targets+=( install install_tmpfiles_configuration ) + if use systemd; then + # install systemd related files only when requested, bug #522430 + targets+=( install_systemd_units ) + fi + else + targets+=( install_device-mapper ) + fi + + # -j1 for bug #918125 + emake -j1 V=1 DESTDIR="${D}" "${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/\//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 +} -- cgit v1.2.3