sys-fs/lvm2: bump, bugfix release from upstream, stable candidate
authorRobin H. Johnson <robbat2@gentoo.org>
Tue, 18 Jun 2019 05:25:22 +0000 (22:25 -0700)
committerRobin H. Johnson <robbat2@gentoo.org>
Tue, 18 Jun 2019 05:27:16 +0000 (22:27 -0700)
Package-Manager: Portage-2.3.67, Repoman-2.3.12
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
12 files changed:
sys-fs/lvm2/Manifest
sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2
sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1
sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2
sys-fs/lvm2/files/lvm.rc-2.02.105-r2
sys-fs/lvm2/files/lvm.rc-2.02.116-r6
sys-fs/lvm2/files/lvm.rc-2.02.172
sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2
sys-fs/lvm2/files/lvmetad.initd-2.02.116-r3
sys-fs/lvm2/files/lvmlockd.initd-2.02.166-r1
sys-fs/lvm2/lvm2-2.02.145-r2.ebuild
sys-fs/lvm2/lvm2-2.02.185.ebuild [new file with mode: 0644]

index fa9cdc1b27ed5bb2e0d8e3c53cd7b766bd453122..bf3cba8c8b2329f2cc0eeb4a1500e841ed3fd494 100644 (file)
@@ -2,3 +2,4 @@ DIST LVM2.2.02.116.tgz 1538340 BLAKE2B 718261b60626f2eca5ba13011646bf551523ed8e5
 DIST LVM2.2.02.145.tgz 1986370 BLAKE2B 0c9e5efae17f26ff86152cecbf0b11a74e85007b2fa9491f44dec03ac8c11375bacf6685213b4be19037c8fbf70e13549516716ecf8fa262919a44625e6aab34 SHA512 84e28b3efc940837ea9da70fce620744aea0945ba29383b76ad7bcd4b5259b897c714162a8e8b7cfe26ae736a3ad2eca633a3e0df4d6280a32b28bd4cf472d27
 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
index 7dbacce0d94f30798be54e3133d9f8b20a51cec0..79fdff246fb76aa19e7d3d0d4e8720985b1477ac 100644 (file)
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
index 930e84baa866bbb31a47ee64748f502aa9ffd2eb..f77996caa57715d291c913486bed7ee14c1ed6b1 100644 (file)
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 PIDFILE=/run/dmeventd.pid
index d603718cc22694d8145f7082df50c1890ae6a4de..914d6637c7a69aa998c49157918a78edd5823cd5 100644 (file)
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This script is based on upstream file
index c59f9c3c8788747debd85c826b99a902436687d0..937db047d198bfab072f28926d9b0e9bed67ca22 100644 (file)
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 depend() {
index 1bf075fae3ef80990884ea398f354cfa13dc33cf..cf430c6654db6df6765ae7d0dd02fd12b4428a68 100644 (file)
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 _get_lvm_path() {
index c3f1f08f399c9b895a9bc102f7fa9d92adcbc194..82037b28adf98efc194c6a4fdd2d1cc8b977306e 100644 (file)
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 _get_lvm_path() {
index c95a47d5be51b4429730aeb4cef5b1023d0210cc..565f49c7c42609ed307524af3e34d04378602076 100644 (file)
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 pidfile="/run/lvmetad.pid"
index 2efce4223e552395e3148bb0c7f08a535141f1fb..55bbf9c4b63b885b82a87545b82c46823ad8ff48 100644 (file)
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 pidfile="/run/lvmetad.pid"
index 16e2cc3f12bfdb4e46ac0d31a444dc79f3a692e4..8b5986fae242d11a932bc630b51cd5e97eae4e2d 100644 (file)
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 pidfile="/run/lvmlockd.pid"
index 2890ca59239edac5eed4864829dda9d39fd99670..31435ff9d055dd012ffafc930350ca5443543af0 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/sys-fs/lvm2/lvm2-2.02.185.ebuild b/sys-fs/lvm2/lvm2-2.02.185.ebuild
new file mode 100644 (file)
index 0000000..f82f1a6
--- /dev/null
@@ -0,0 +1,270 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools linux-info multilib systemd toolchain-funcs udev flag-o-matic
+
+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}
+       virtual/pkgconfig
+       >=sys-devel/binutils-2.20.1-r1
+       sys-devel/autoconf-archive
+       static? (
+               selinux? ( sys-libs/libselinux[static-libs] )
+               udev? ( >=sys-fs/eudev-3.1.2[static-libs] )
+               >=sys-apps/util-linux-2.16[static-libs]
+       )"
+
+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
+)
+
+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
+
+       # Without thin-privision-tools, there is nothing to install for target install_man7:
+       if ! use thin ; then
+               sed -i -e '/^install_lvm2/s:install_man7::' 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}"
+       )
+       econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+       pushd include >/dev/null
+       emake
+       popd >/dev/null
+
+       if use device-mapper-only ; then
+               emake device-mapper
+       else
+               emake
+               emake 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 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
+               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
+       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"
+}