diff options
Diffstat (limited to 'sys-fs/lvm2')
| -rw-r--r-- | sys-fs/lvm2/Manifest | 6 | ||||
| -rw-r--r-- | sys-fs/lvm2/lvm2-2.02.185-r1.ebuild (renamed from sys-fs/lvm2/lvm2-2.02.185.ebuild) | 14 | ||||
| -rw-r--r-- | sys-fs/lvm2/lvm2-2.02.186.ebuild | 280 | ||||
| -rw-r--r-- | sys-fs/lvm2/lvm2-2.03.05-r1.ebuild (renamed from sys-fs/lvm2/lvm2-2.03.05.ebuild) | 14 |
4 files changed, 302 insertions, 12 deletions
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest index 69f745499cf4..c47b3d0a8eba 100644 --- a/sys-fs/lvm2/Manifest +++ b/sys-fs/lvm2/Manifest @@ -49,11 +49,13 @@ DIST LVM2.2.02.145.tgz 1986370 BLAKE2B 0c9e5efae17f26ff86152cecbf0b11a74e85007b2 DIST LVM2.2.02.183.tgz 2380574 BLAKE2B b1fe71b6cdb8ee20dd53d0ad3399c553487baafa12657ec81a794c84ad161988afdb8693ac247877a2645d693a0740c74c8b991047ed2ba4adc9ec75f1c261a9 SHA512 3947523c6b0862ada40677ed171ed0cf95e070119e377296fc5ccb153e9c4212d34c0b16a887dbd68ccf265525345dabfed2aa59fb3604555429a7e2ecfff4d7 DIST LVM2.2.02.184.tgz 2383698 BLAKE2B b6e308d76d541b9461dfcc6e82db256a175ccdabfae9c9d57d84eabd0d5ea50e3e09954b34741903e027412c2c26f72a5005fe934261576337a810738139deb8 SHA512 9db74f675e7c58f663a39afb79b6f33a33ad2cfbda63e9783ef5027f33977b4a1262a2e6754aa67c586eed083ee119a2e837c32a7746dcc53f13877c9d65c390 DIST LVM2.2.02.185.tgz 2386328 BLAKE2B d2e31de3eedd7518ea2d239cb9b36b38e351d7fc070097a1fc4e7934e3636195da3247fba57d684bb0b31b7f3dbdfe29161bd121b2962b2c35c8c9d7914b4506 SHA512 f421505551aec2a09bc862f2fcc1ee825bc4d94c53a01d13265631e99308d60fbca40112be5bc7824cce3ef223c0775d2f6c345f6a3f227229a0566c903841bf +DIST LVM2.2.02.186.tgz 2389759 BLAKE2B e094c0135d455386ea5789208899d4dbdd5e78bebf52e49ab5587f881fbc2b94c6accecacf1b4ed182b0c87046402c00a47a1b724795a94fe3ec998b580a77ae SHA512 06a1c00142ee41d8a576a5e06a5beae70baced3020e753ce3b612355cc4d9e33be4acf58569d49436c4ee1118d288d884c7301b7d886074eaf9f2fa6b0248c03 DIST LVM2.2.03.05.tgz 2427412 BLAKE2B a66f199b6b9b593746ff7738657d80c3dc6201b417736e8136e8c894532611d9a4b44c3c791cb7dac539e6e2683b348ba17917a2a9ba539ec15cac5c25713816 SHA512 3b00f53771e99faa6459ae73353bff06ae37c64bd2659586ec25d0bb43bc3ff8ba5f713c68617fd7662a5f6cb65bca1ad0aea554819048d79c1cce20bf67c50a EBUILD lvm2-2.02.116.ebuild 8450 BLAKE2B 1e028c3b1c14ac9e0e8bad95c4882bd05d5227f462f594f9af5b4fb58c1cb89412006e497211645dbadbf3fcca35f95c88d5b30bd7415ea4ecf53be26e8465cc SHA512 6aebbe79f13bc0ce8422c9d0ed73f30efe9f04cbbdc190b5d52dc63be981be1cd350c9dd586a6dc2704e4c5abb7ca16eee878350eddbcee46ebdd21f148ef07b EBUILD lvm2-2.02.145-r2.ebuild 8637 BLAKE2B e21d693c8428d8704be6f5065939081f0c1992f016a55ca2d2074caf9a4066ee45cb02b57c84d6377d0e993110da67164716f1974ed474a095c54c3dd30f0c90 SHA512 cd63c1e595901e17f9cd0fb7d780ea8538e3fbc48111fbd6e3d3ba9c7aff23d7deeeb8e556aa7c206884f49891a534911f0186750a15d4bbdc81424f1316025a EBUILD lvm2-2.02.183.ebuild 8886 BLAKE2B f70bfabc88eeacfd2ea52a22ade436296276f53db341ed1be96e72e5309f4494c6ecd14b5a057f33c67efc36c5029c146a90aa3db6580c03290598043597fc26 SHA512 87c6dcce5a9731e3d0f4c8ddee25db5324dd25ac66a70f632a9653d1874a10eef84ec4ab6089651b00a8663cb3af9bf7c10df352353e32d04d7a74fc80438922 EBUILD lvm2-2.02.184-r4.ebuild 9424 BLAKE2B bf506a9a4cd7bd4a307ffb274943c502aadddfe35bed56841116d6cf8e2dd33d051e769f36dae1a678dc292f68d49b337634c2cc16ceddd284495da319075505 SHA512 a69837d3c29391fcc907a641340e96d46d49085a10c43c31fb2236ee113f1be9331ad8d75cf3152de87ce765f93bcabea7cef1183d7bf6176654ff410b048e92 -EBUILD lvm2-2.02.185.ebuild 9546 BLAKE2B 5340d3dd5b5644ac8c6edb7379610950d5f0cd94ce09b7e3d9b68d1bcb67c78cc79ed2f5fb16ecc070119a7a050c95dd3df666238b0544abd4e76d4f154b3e45 SHA512 d675da33cba6f0de1e5fa614f60ee01f4fb0461f3776a7dce9dd2c7c93008373f081fcd817db2183f05d697e6f9077f6a8de032f806eb23e12130c48be558451 -EBUILD lvm2-2.03.05.ebuild 8925 BLAKE2B b34bb9025be56cbd85a0c9c886527252b254fffc62452bfd8b0d7229c91eddbc815cf3d0b005c783d28a42980fd2173c169fbf4472629fa21696d65b97e2a864 SHA512 af7b0c8a801022f753a0268a7bde1e88c6a05c636722eb9cddd8cc54b2c73042078f5c6fc571e8189b30daa6fadbae40012779316a27649f9b3bbe6af01bbae9 +EBUILD lvm2-2.02.185-r1.ebuild 9615 BLAKE2B 0cab9042fa65ac0d5a18af8a704b21e726a859d51b691a0abd3fba85f39157b19a194d419543271d75186f2298de2c9482307b86b09aff477611df1373885f17 SHA512 9c236f62da5a4d71f29385b255ea4ceaf25a1cec624eb5fe89ba0c149375d4e6e36b39451c123c45c5982c98f532718a35523c1ef7233b820343ca28aa450ba5 +EBUILD lvm2-2.02.186.ebuild 9615 BLAKE2B 0cab9042fa65ac0d5a18af8a704b21e726a859d51b691a0abd3fba85f39157b19a194d419543271d75186f2298de2c9482307b86b09aff477611df1373885f17 SHA512 9c236f62da5a4d71f29385b255ea4ceaf25a1cec624eb5fe89ba0c149375d4e6e36b39451c123c45c5982c98f532718a35523c1ef7233b820343ca28aa450ba5 +EBUILD lvm2-2.03.05-r1.ebuild 8994 BLAKE2B 071fcdc622045a2365b8da2728e84c99ed072e9811742ef47a506d851265cea876aae9720c40c15610b6dd6633ad03a4ab1d709ea62d50d4bf08d39b2a6565ed SHA512 9cfb92c77b5efaf0e4472e028d94373cad788cf911e1a3a2ec53e9ccf8ed7420c06e40624666e50f1bfe3a19f683cf247a730d2ec11ee4b5dbd39ca29282f249 MISC metadata.xml 1146 BLAKE2B 7a4bbf38d2e752523c2909c240a2c90ada04aee8efe96c62c5989887f4997e00a4ed7312dd9803d8ddcae02e8bbc3ba8f0fa9e5da0f484bc9768e0ed99ab8be3 SHA512 24240ba35d93d9f9171f2b164d949846a5ea2126eceed4b4454dd0b4efb9b1132f9f6717d2c7364f20820b792bbaf26dc274f7c10767993b35a565a76e042f4f diff --git a/sys-fs/lvm2/lvm2-2.02.185.ebuild b/sys-fs/lvm2/lvm2-2.02.185-r1.ebuild index 812f84d2b656..c18e5334dcd1 100644 --- a/sys-fs/lvm2/lvm2-2.02.185.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.185-r1.ebuild @@ -115,9 +115,9 @@ src_prepare() { sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514 - # Without thin-privision-tools, there is nothing to install for target install_man7: + # Don't install thin man page when not requested if ! use thin ; then - sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die + sed -i -e 's/^\(MAN7+=.*\) $(LVMTHINMAN) \(.*\)$/\1 \2/' man/Makefile.in || die fi eautoreconf @@ -242,10 +242,14 @@ src_install() { if use static-libs; then dolib.a libdm/ioctl/libdevmapper.a - dolib.a libdaemon/client/libdaemonclient.a #462908 #gen_usr_ldscript libdevmapper.so - dolib.a daemons/dmeventd/libdevmapper-event.a - #gen_usr_ldscript libdevmapper-event.so + if use !device-mapper-only; then + # depends on lvmetad + dolib.a libdaemon/client/libdaemonclient.a #462908 + # depends on dmeventd + dolib.a daemons/dmeventd/libdevmapper-event.a + #gen_usr_ldscript libdevmapper-event.so + fi else rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a fi diff --git a/sys-fs/lvm2/lvm2-2.02.186.ebuild b/sys-fs/lvm2/lvm2-2.02.186.ebuild new file mode 100644 index 000000000000..c18e5334dcd1 --- /dev/null +++ b/sys-fs/lvm2/lvm2-2.02.186.ebuild @@ -0,0 +1,280 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +inherit autotools linux-info multilib systemd toolchain-funcs udev flag-o-matic usr-ldscript + +DESCRIPTION="User-land utilities for LVM2 (device-mapper) software" +HOMEPAGE="https://sourceware.org/lvm2/" +SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz + ftp://sourceware.org/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~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 ) + 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:=[static-libs?] )" +# /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/openrc-0.11 + !<sys-fs/cryptsetup-1.1.2 + !!sys-fs/lvm-user + >=sys-apps/util-linux-2.16 + lvm2create_initrd? ( sys-apps/makedev ) + thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )" +# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check +# USE 'static' currently only works with eudev, bug 520450 +DEPEND="${DEPEND_COMMON} + >=sys-devel/binutils-2.20.1-r1 + static? ( + selinux? ( sys-libs/libselinux[static-libs] ) + udev? ( >=sys-fs/eudev-3.1.2[static-libs] ) + >=sys-apps/util-linux-2.16[static-libs] + )" +BDEPEND=" + sys-devel/autoconf-archive + virtual/pkgconfig +" + +S="${WORKDIR}/${PN/lvm/LVM}.${PV}" + +PATCHES=( + # Gentoo specific modification(s): + "${FILESDIR}"/${PN}-2.02.178-example.conf.in.patch + + # For upstream -- review and forward: + "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch + "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch + "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331 + "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373 + "${FILESDIR}"/${PN}-2.02.178-asneeded.patch # -Wl,--as-needed + "${FILESDIR}"/${PN}-2.02.178-dynamic-static-ldflags.patch #332905 + "${FILESDIR}"/${PN}-2.02.178-static-pkgconfig-libs.patch #370217, #439414 + blkid + "${FILESDIR}"/${PN}-2.02.176-pthread-pkgconfig.patch #492450 + "${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756 + "${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446 + #"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream + "${FILESDIR}"/${PN}-2.02.184-dmeventd-no-idle-exit.patch + #"${FILESDIR}"/${PN}-2.02.184-allow-reading-metadata-with-invalid-creation_time.patch #682380 # merged upstream + "${FILESDIR}"/${PN}-2.02.184-mksh_build.patch #686652 +) + +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 + + sed -i \ + -e "1iAR = $(tc-getAR)" \ + -e "s:CC ?= @CC@:CC = $(tc-getCC):" \ + make.tmpl.in || die #444082 + + sed -i -e '/FLAG/s:-O2::' configure{.ac,} || die #480212 + + if use udev && ! use device-mapper-only; then + sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196 + elog "Notice that \"use_lvmetad\" setting is enabled with USE=\"udev\" in" + elog "/etc/lvm/lvm.conf, which will require restart of udev, lvm, and lvmetad" + elog "if it was previously disabled." + fi + + 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 + sed -i -e 's/^\(MAN7+=.*\) $(LVMTHINMAN) \(.*\)$/\1 \2/' man/Makefile.in || die + fi + + eautoreconf +} + +src_configure() { + filter-flags -flto + local myeconfargs=() + + # Most of this package does weird stuff. + # 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 applib) + $(use_enable !device-mapper-only fsadm) + $(use_enable !device-mapper-only lvmetad) + $(use_enable !device-mapper-only lvmpolld) + $(usex device-mapper-only --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)" + + # disable O_DIRECT support on hppa, breaks pv detection (#99532) + $(usex hppa --disable-o_direct '') + ) + + if 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+=( --with-clvmd=none --with-cluster=none ) + + myeconfargs+=( + $(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 "$(get_udevdir)"/rules.d) + $(use_enable sanlock lvmlockd-sanlock) + $(use_enable systemd udev-systemd-background-jobs) + $(use_enable systemd notify-dbus) + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" + CLDFLAGS="${LDFLAGS}" + ) + # Hard-wire this to bash as some shells (dash) don't know + # "-o pipefail" #682404 + CONFIG_SHELL="/bin/bash" \ + econf "${myeconfargs[@]}" +} + +src_compile() { + pushd include >/dev/null + emake V=1 + popd >/dev/null + + if use device-mapper-only ; then + emake V=1 device-mapper + else + emake V=1 + emake V=1 CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat + fi +} + +src_install() { + local inst INSTALL_TARGETS + INSTALL_TARGETS=( install install_tmpfiles_configuration ) + # install systemd related files only when requested, bug #522430 + use systemd && INSTALL_TARGETS+=( install_systemd_units install_systemd_generators ) + use device-mapper-only && INSTALL_TARGETS=( install_device-mapper ) + for inst in ${INSTALL_TARGETS[@]}; do + emake V=1 DESTDIR="${D}" ${inst} + done + + 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 + newinitd "${FILESDIR}"/dmeventd.initd-2.02.184-r2 dmeventd + newinitd "${FILESDIR}"/lvm.rc-2.02.184-r3 lvm + newconfd "${FILESDIR}"/lvm.confd-2.02.184-r3 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-2.02.105-r2 lvm-monitoring + newinitd "${FILESDIR}"/lvmetad.initd-2.02.116-r3 lvmetad + newinitd "${FILESDIR}"/lvmpolld.initd-2.02.183 lvmpolld + fi + + if use sanlock; then + newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd + fi + + if use static-libs; then + dolib.a libdm/ioctl/libdevmapper.a + #gen_usr_ldscript libdevmapper.so + if use !device-mapper-only; then + # depends on lvmetad + dolib.a libdaemon/client/libdaemonclient.a #462908 + # depends on dmeventd + dolib.a daemons/dmeventd/libdevmapper-event.a + #gen_usr_ldscript libdevmapper-event.so + 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 + fi + + insinto /etc + doins "${FILESDIR}"/dmtab + + dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf +} + +pkg_postinst() { + 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 /etc/lvm/lvm.conf if you want" + ewarn "to enable lvm autoactivation and metadata caching." +} + +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" +} diff --git a/sys-fs/lvm2/lvm2-2.03.05.ebuild b/sys-fs/lvm2/lvm2-2.03.05-r1.ebuild index 12b13a5e36e6..e1103033f62a 100644 --- a/sys-fs/lvm2/lvm2-2.03.05.ebuild +++ b/sys-fs/lvm2/lvm2-2.03.05-r1.ebuild @@ -108,9 +108,9 @@ src_prepare() { sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514 - # Without thin-privision-tools, there is nothing to install for target install_man7: + # Don't install thin man page when not requested if ! use thin ; then - sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die + sed -i -e 's/^\(MAN7+=.*\) $(LVMTHINMAN) \(.*\)$/\1 \2/' man/Makefile.in || die fi eautoreconf @@ -230,10 +230,14 @@ src_install() { if use static-libs; then dolib.a libdm/ioctl/libdevmapper.a - dolib.a libdaemon/client/libdaemonclient.a #462908 #gen_usr_ldscript libdevmapper.so - dolib.a daemons/dmeventd/libdevmapper-event.a - #gen_usr_ldscript libdevmapper-event.so + if use !device-mapper-only; then + # depends on lvmetad + dolib.a libdaemon/client/libdaemonclient.a #462908 + # depends on dmeventd + dolib.a daemons/dmeventd/libdevmapper-event.a + #gen_usr_ldscript libdevmapper-event.so + fi else rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a fi |