commit: cdb3ab396f48a446d0f51ab2e147816a2823ea37 Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> AuthorDate: Fri Oct 21 23:14:24 2016 +0000 Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org> CommitDate: Fri Oct 21 23:15:29 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cdb3ab39
sys-fs/lvm2: bump. Package-Manager: portage-2.3.2 Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org> sys-fs/lvm2/Manifest | 1 + sys-fs/lvm2/files/clvmd.rc-2.02.39 | 2 +- sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2 | 2 +- sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1 | 2 +- sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2 | 2 +- sys-fs/lvm2/files/lvm.rc-2.02.105-r2 | 2 +- sys-fs/lvm2/files/lvm.rc-2.02.116-r4 | 2 +- sys-fs/lvm2/files/lvm.rc-2.02.116-r6 | 2 +- sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2 | 2 +- sys-fs/lvm2/files/lvmetad.initd-2.02.116-r3 | 2 +- sys-fs/lvm2/lvm2-2.02.116-r1.ebuild | 2 +- sys-fs/lvm2/lvm2-2.02.116-r2.ebuild | 2 +- sys-fs/lvm2/lvm2-2.02.116.ebuild | 2 +- sys-fs/lvm2/lvm2-2.02.136.ebuild | 2 +- ...vm2-2.02.116-r2.ebuild => lvm2-2.02.166.ebuild} | 100 ++++++++++++--------- 15 files changed, 72 insertions(+), 55 deletions(-) diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest index 3ff8f23..16a2de5 100644 --- a/sys-fs/lvm2/Manifest +++ b/sys-fs/lvm2/Manifest @@ -2,3 +2,4 @@ DIST LVM2.2.02.116.tgz 1538340 SHA256 2479d6ea61c405efcfcd8a78390d00c1d2e9c92c02 DIST LVM2.2.02.136.tgz 1891010 SHA256 c6af90097d8f7cd851d38c4f57bb3ad7039cfa123f1e336dba957814a298bd8c SHA512 ebda683e7dbeb2c4860a583d47e60756d18127e37a373ab2958af8e54b9bee0d2e3370b7803d88fa4b08564345c88af55bfbac317081160118ce4b3733b69f9d WHIRLPOOL 8020fdddac648e32084801ffaf9b00b8a683870c8dd8dd5969851fd081eb1efd578decd82cd4a7a24fb6150c55afafdd819a76eb7eb6926cdc057455cc1d1618 DIST LVM2.2.02.139.tgz 1897293 SHA256 f423b1f2eee70efd671afc0982caa92e9413a582404057244021314172ec3a07 SHA512 f112207d7447606915026495b931bffc4c0d68d36b9a8792fe4b7abf8b743bc4559da5c79145cb4d457337118e60552f9df511e31f2799001d29d006f7946cc0 WHIRLPOOL 8a1ca0bb6946b1f6761223a4a9e7c5e3e5247ff4b85bc08734258f4616fbabb0ea7a3b22b4a245367997ad810b4b304b747d8da0bd128c241fbafe645855b7f9 DIST LVM2.2.02.145.tgz 1986370 SHA256 98b7c4c07c485a462c6a86e1a5265757133ceea36289ead8a419af29ef39560b SHA512 84e28b3efc940837ea9da70fce620744aea0945ba29383b76ad7bcd4b5259b897c714162a8e8b7cfe26ae736a3ad2eca633a3e0df4d6280a32b28bd4cf472d27 WHIRLPOOL b8c6f4b737625547d4c2994d055f3334e2954f160d10840f1405b6a78f25fc17ba1d270f574408c151140e2afceb007cbfa1c146ed105bbdeca001a03368d549 +DIST LVM2.2.02.166.tgz 2148324 SHA256 e120b066b85b224552efda40204488c5123de068725676fd6e5c8bc655051b94 SHA512 8bebe9b474f791b5edf5366b0bd24861fbbaf8a83afa2a9e2a8e3917e05e4ecbf6877f018be03ffb4e9b4c8832208264165b85182bf79a07661adf35128b4a21 WHIRLPOOL a4c2e0b2e8da85301b2518b35193304436715fdf45cbc7bc28fd6f7b88af15e611134d5a530d2311b23544aa67c3a7f13fd3780d4d46fc10854e624fb8b27870 diff --git a/sys-fs/lvm2/files/clvmd.rc-2.02.39 b/sys-fs/lvm2/files/clvmd.rc-2.02.39 index f279c9d..27125af 100644 --- a/sys-fs/lvm2/files/clvmd.rc-2.02.39 +++ b/sys-fs/lvm2/files/clvmd.rc-2.02.39 @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2 b/sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2 index f305b09..a6ec42b 100644 --- a/sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2 +++ b/sys-fs/lvm2/files/device-mapper.rc-2.02.105-r2 @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1 b/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1 index d337bc4..e91c5c6 100644 --- a/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1 +++ b/sys-fs/lvm2/files/dmeventd.initd-2.02.67-r1 @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2 b/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2 index f07c157..9181c95 100644 --- a/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2 +++ b/sys-fs/lvm2/files/lvm-monitoring.initd-2.02.105-r2 @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.105-r2 b/sys-fs/lvm2/files/lvm.rc-2.02.105-r2 index 8ddb7d7..5217116 100644 --- a/sys-fs/lvm2/files/lvm.rc-2.02.105-r2 +++ b/sys-fs/lvm2/files/lvm.rc-2.02.105-r2 @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.116-r4 b/sys-fs/lvm2/files/lvm.rc-2.02.116-r4 index 9f8f753..a09b0ef 100644 --- a/sys-fs/lvm2/files/lvm.rc-2.02.116-r4 +++ b/sys-fs/lvm2/files/lvm.rc-2.02.116-r4 @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.116-r6 b/sys-fs/lvm2/files/lvm.rc-2.02.116-r6 index 35ddbe8..990fd6c 100644 --- a/sys-fs/lvm2/files/lvm.rc-2.02.116-r6 +++ b/sys-fs/lvm2/files/lvm.rc-2.02.116-r6 @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2 b/sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2 index 150e10a..2f9ab0c 100644 --- a/sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2 +++ b/sys-fs/lvm2/files/lvmetad.initd-2.02.105-r2 @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/sys-fs/lvm2/files/lvmetad.initd-2.02.116-r3 b/sys-fs/lvm2/files/lvmetad.initd-2.02.116-r3 index 7b872e7..d41239e 100644 --- a/sys-fs/lvm2/files/lvmetad.initd-2.02.116-r3 +++ b/sys-fs/lvm2/files/lvmetad.initd-2.02.116-r3 @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/sys-fs/lvm2/lvm2-2.02.116-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.116-r1.ebuild index c393e7a..8bae579 100644 --- a/sys-fs/lvm2/lvm2-2.02.116-r1.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.116-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/sys-fs/lvm2/lvm2-2.02.116-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.116-r2.ebuild index 6ecd225..bc1463d 100644 --- a/sys-fs/lvm2/lvm2-2.02.116-r2.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.116-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/sys-fs/lvm2/lvm2-2.02.116.ebuild b/sys-fs/lvm2/lvm2-2.02.116.ebuild index b4744cf..48cc2d99 100644 --- a/sys-fs/lvm2/lvm2-2.02.116.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.116.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/sys-fs/lvm2/lvm2-2.02.136.ebuild b/sys-fs/lvm2/lvm2-2.02.136.ebuild index 78a2994..ace28c7 100644 --- a/sys-fs/lvm2/lvm2-2.02.136.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.136.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ diff --git a/sys-fs/lvm2/lvm2-2.02.116-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.166.ebuild similarity index 74% copy from sys-fs/lvm2/lvm2-2.02.116-r2.ebuild copy to sys-fs/lvm2/lvm2-2.02.166.ebuild index 6ecd225..8fd309c 100644 --- a/sys-fs/lvm2/lvm2-2.02.116-r2.ebuild +++ b/sys-fs/lvm2/lvm2-2.02.166.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ -EAPI=5 +EAPI=6 inherit autotools eutils linux-info multilib systemd toolchain-funcs udev flag-o-matic DESCRIPTION="User-land utilities for LVM2 (device-mapper) software" @@ -13,13 +13,21 @@ SRC_URI="ftp://sourceware.org/pub/lvm2/${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 clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only" -REQUIRED_USE="device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin ) +IUSE="readline static static-libs systemd clvm cman corosync lvm1 lvm2create_initrd openais selinux +udev +thin device-mapper-only" +REQUIRED_USE="device-mapper-only? ( !clvm !cman !corosync !lvm1 !lvm2create_initrd !openais !thin ) systemd? ( udev ) clvm? ( !systemd )" -DEPEND_COMMON="clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) +DEPEND_COMMON=" + clvm? ( + cman? ( =sys-cluster/cman-3* ) + corosync? ( sys-cluster/corosync ) + openais? ( sys-cluster/openais ) + =sys-cluster/libdlm-3* + ) + readline? ( sys-libs/readline:0= ) + 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. @@ -38,6 +46,7 @@ RDEPEND="${DEPEND_COMMON} 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] ) @@ -46,6 +55,22 @@ DEPEND="${DEPEND_COMMON} S=${WORKDIR}/${PN/lvm/LVM}.${PV} +PATCHES=( + # Gentoo specific modification(s): + "${FILESDIR}"/${PN}-2.02.129-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.70-asneeded.patch # -Wl,--as-needed + "${FILESDIR}"/${PN}-2.02.139-dynamic-static-ldflags.patch #332905 + "${FILESDIR}"/${PN}-2.02.129-static-pkgconfig-libs.patch #370217, #439414 + blkid + "${FILESDIR}"/${PN}-2.02.130-pthread-pkgconfig.patch #492450 + #"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream +) + pkg_setup() { local CONFIG_CHECK="~SYSVIPC" @@ -71,8 +96,7 @@ pkg_setup() { } src_prepare() { - # Gentoo specific modification(s): - epatch "${FILESDIR}"/${PN}-2.02.108-example.conf.in.patch + default sed -i \ -e "1iAR = $(tc-getAR)" \ @@ -90,16 +114,6 @@ src_prepare() { sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514 - # For upstream -- review and forward: - epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch - epatch "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch - epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331 - epatch "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373 - epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed - epatch "${FILESDIR}"/${PN}-2.02.92-dynamic-static-ldflags.patch #332905 - epatch "${FILESDIR}"/${PN}-2.02.108-static-pkgconfig-libs.patch #370217, #439414 + blkid - epatch "${FILESDIR}"/${PN}-2.02.106-pthread-pkgconfig.patch #492450 - # Without thin-privision-tools, there is nothing to install for target install_man7: use thin || { sed -i -e '/^install_lvm2/s:install_man7::' man/Makefile.in || die; } @@ -108,15 +122,15 @@ src_prepare() { src_configure() { filter-flags -flto - local myconf + local myconf=() local buildmode - myconf="${myconf} $(use_enable !device-mapper-only dmeventd)" - myconf="${myconf} $(use_enable !device-mapper-only cmdlib)" - myconf="${myconf} $(use_enable !device-mapper-only applib)" - myconf="${myconf} $(use_enable !device-mapper-only fsadm)" - myconf="${myconf} $(use_enable !device-mapper-only lvmetad)" - use device-mapper-only && myconf="${myconf} --disable-udev-systemd-background-jobs" + myconf+=( $(use_enable !device-mapper-only dmeventd) ) + myconf+=( $(use_enable !device-mapper-only cmdlib) ) + myconf+=( $(use_enable !device-mapper-only applib) ) + myconf+=( $(use_enable !device-mapper-only fsadm) ) + myconf+=( $(use_enable !device-mapper-only lvmetad) ) + use device-mapper-only && myconf+=( --disable-udev-systemd-background-jobs ) # Most of this package does weird stuff. # The build options are tristate, and --without is NOT supported @@ -124,7 +138,7 @@ src_configure() { if use static; then buildmode="internal" # This only causes the .static versions to become available - myconf="${myconf} --enable-static_link" + myconf+=( --enable-static_link ) else buildmode="shared" fi @@ -132,30 +146,30 @@ src_configure() { # dmeventd requires mirrors to be internal, and snapshot available # so we cannot disable them - myconf="${myconf} --with-mirrors=${dmbuildmode}" - myconf="${myconf} --with-snapshots=${dmbuildmode}" + myconf+=( --with-mirrors=${dmbuildmode} ) + myconf+=( --with-snapshots=${dmbuildmode} ) if use thin; then - myconf="${myconf} --with-thin=internal --with-cache=internal" + myconf+=( --with-thin=internal --with-cache=internal ) local texec for texec in check dump repair restore; do - myconf="${myconf} --with-thin-${texec}=${EPREFIX}/sbin/thin_${texec}" - myconf="${myconf} --with-cache-${texec}=${EPREFIX}/sbin/cache_${texec}" + myconf+=( --with-thin-${texec}="${EPREFIX}"/sbin/thin_${texec} ) + myconf+=( --with-cache-${texec}="${EPREFIX}"/sbin/cache_${texec} ) done else - myconf="${myconf} --with-thin=none --with-cache=none" + myconf+=( --with-thin=none --with-cache=none ) fi if use lvm1; then - myconf="${myconf} --with-lvm1=${buildmode}" + myconf+=( --with-lvm1=${buildmode} ) else - myconf="${myconf} --with-lvm1=none" + myconf+=( --with-lvm1=none ) fi # disable O_DIRECT support on hppa, breaks pv detection (#99532) - use hppa && myconf="${myconf} --disable-o_direct" + use hppa && myconf+=( --disable-o_direct ) if use clvm; then - myconf="${myconf} --with-cluster=${buildmode}" + myconf+=( --with-cluster=${buildmode} ) # 4-state! Make sure we get it right, per bug 210879 # Valid options are: none, cman, gulm, all # @@ -169,11 +183,13 @@ src_configure() { local clvmd="" use cman && clvmd="cman" #clvmd="${clvmd/cmangulm/all}" + use corosync && clvmd="${clvmd:+$clvmd,}corosync" + use openais && clvmd="${clvmd:+$clvmd,}openais" [ -z "${clvmd}" ] && clvmd="none" - myconf="${myconf} --with-clvmd=${clvmd}" - myconf="${myconf} --with-pool=${buildmode}" + myconf+=( --with-clvmd=${clvmd} ) + myconf+=( --with-pool=${buildmode} ) else - myconf="${myconf} --with-clvmd=none --with-cluster=none" + myconf+=( --with-clvmd=none --with-cluster=none ) fi econf \ @@ -194,8 +210,8 @@ src_configure() { $(use_enable udev udev_sync) \ $(use_with udev udevdir "$(get_udevdir)"/rules.d) \ $(use_enable systemd udev-systemd-background-jobs) \ - "$(systemd_with_unitdir)" \ - ${myconf} \ + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ + ${myconf[@]} \ CLDFLAGS="${LDFLAGS}" } @@ -227,11 +243,11 @@ src_install() { if use !device-mapper-only ; then newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd - newinitd "${FILESDIR}"/lvm.rc-2.02.105-r2 lvm + newinitd "${FILESDIR}"/lvm.rc-2.02.116-r6 lvm newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring - newinitd "${FILESDIR}"/lvmetad.initd-2.02.105-r2 lvmetad + newinitd "${FILESDIR}"/lvmetad.initd-2.02.116-r3 lvmetad fi if use clvm; then
