commit:     3956e9e8826eefd12c06f680cb8a8f10a742ed93
Author:     Felix Neumärker <xdch47 <AT> posteo <DOT> de>
AuthorDate: Tue Dec 10 14:26:07 2019 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Tue Dec 10 16:47:40 2019 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=3956e9e8

sys-fs/lvm2: sync with tree

Package-Manager: Portage-2.3.79, Repoman-2.3.16
Manifest-Sign-Key: 0DEDF1A904568BAD1FC45C283DCC44782ED07E1C
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 sys-fs/lvm2/Manifest                               |  15 ++
 sys-fs/lvm2/files/lvm2-2.02.184-mksh_build.patch   |  13 +
 ...2-2.02.186-udev_remove_unsupported_option.patch |  34 +++
 sys-fs/lvm2/lvm2-2.02.184-r5.ebuild                | 275 ++++++++++++++++++++
 sys-fs/lvm2/lvm2-2.02.186-r2.ebuild                | 283 +++++++++++++++++++++
 5 files changed, 620 insertions(+)

diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 789b3eb..b7043ca 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -1,2 +1,17 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 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.186.tgz 2389759 BLAKE2B 
e094c0135d455386ea5789208899d4dbdd5e78bebf52e49ab5587f881fbc2b94c6accecacf1b4ed182b0c87046402c00a47a1b724795a94fe3ec998b580a77ae
 SHA512 
06a1c00142ee41d8a576a5e06a5beae70baced3020e753ce3b612355cc4d9e33be4acf58569d49436c4ee1118d288d884c7301b7d886074eaf9f2fa6b0248c03
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAEBCAAdFiEEDe3xqQRWi60fxFwoPcxEeC7QfhwFAl3vqfcACgkQPcxEeC7Q
+fhwSxwf/fiCH3bVA5161TlVLqLnt1U9L5kJBHnUzha2oB5Pl6zYC6FhYLQwbBBPP
+JFaquKMyd52GSwW5Bh+FoJPb5NUlYeVG5MGz2xSLzmv9crEajF+uBtbx4RbCy8l1
+bwu5Kvm0kl/wY16bjj32Nb1JC/NYJL48Hlp1ctHiWXwAIhMTIWyHmde1WwXncwRM
+xGoXAO2t3XQR3OWuJlvUfq2SJHIbd4IF4wlM6R4805Hks/kLePqCQ4gVp/PS5FMK
+PwcCuf5uC0Iad7nlxQAZzhKLKk819Sf9bAOEruRQmGddnZcb/sJFwOsttv4ykJxu
+a+mjZGkExGsjf2Zktse+9pl4EvE1qA==
+=ODib
+-----END PGP SIGNATURE-----

diff --git a/sys-fs/lvm2/files/lvm2-2.02.184-mksh_build.patch 
b/sys-fs/lvm2/files/lvm2-2.02.184-mksh_build.patch
new file mode 100644
index 0000000..49c6853
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.02.184-mksh_build.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/686652
+
+--- LVM2.2.02.184/tools/Makefile.in
++++ LVM2.2.02.184/tools/Makefile.in
+@@ -220,6 +220,6 @@
+         echo "/* Do not edit. This file is generated by the Makefile. */" && \
+         echo -en "const char _command_input[] =\n\n\"" && \
+         $(EGREP) -v '^#|\-\-\-|^$$' $(srcdir)/command-lines.in | $(AWK) 
'BEGIN {ORS = "\\n\"\n\""} //' && \
+-        echo "\\n\";" \
++        printf "%s\n" "\\n\";" \
+       ) > $@
+ 
+ $(SOURCES:%.c=%.d) $(SOURCES2:%.c=%.d): command-lines-input.h command-count.h 
cmds.h

diff --git 
a/sys-fs/lvm2/files/lvm2-2.02.186-udev_remove_unsupported_option.patch 
b/sys-fs/lvm2/files/lvm2-2.02.186-udev_remove_unsupported_option.patch
new file mode 100644
index 0000000..f895e19
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.02.186-udev_remove_unsupported_option.patch
@@ -0,0 +1,34 @@
+From f98f79a047dd1c4980008e0ed6c9ad4e18596cdc Mon Sep 17 00:00:00 2001
+From: Peter Rajnoha <prajn...@redhat.com>
+Date: Tue, 13 Aug 2019 15:18:30 +0200
+Subject: [PATCH] udev: remove unsupported OPTIONS+="event_timeout" rule
+
+The OPTIONS+="event_timeout" is Unsupported since systemd/udev version 216,
+that is ~5 years ago.
+
+Since systemd/udev version 243, there's a new message printed if unsupported
+OPTIONS value is used:
+
+  Invalid value for OPTIONS key, ignoring: 'event_timeout=180'
+
+Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1740666
+---
+ udev/11-dm-lvm.rules.in | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/udev/11-dm-lvm.rules.in b/udev/11-dm-lvm.rules.in
+index 91cb991df9..7c589943b7 100644
+--- a/udev/11-dm-lvm.rules.in
++++ b/udev/11-dm-lvm.rules.in
+@@ -37,8 +37,6 @@ ENV{DM_SUBSYSTEM_UDEV_FLAG0}!="1", ENV{DM_NOSCAN}=="1", 
ENV{DM_UDEV_DISABLE_OTHE
+ 
+ ENV{DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG}=="1", GOTO="lvm_end"
+ 
+-OPTIONS+="event_timeout=180"
+-
+ # Do not create symlinks for inappropriate subdevices.
+ ENV{DM_LV_NAME}=="pvmove?*|?*_vorigin", GOTO="lvm_disable"
+ ENV{DM_LV_LAYER}=="?*", GOTO="lvm_disable"
+-- 
+2.24.0
+

diff --git a/sys-fs/lvm2/lvm2-2.02.184-r5.ebuild 
b/sys-fs/lvm2/lvm2-2.02.184-r5.ebuild
new file mode 100644
index 0000000..82c54e3
--- /dev/null
+++ b/sys-fs/lvm2/lvm2-2.02.184-r5.ebuild
@@ -0,0 +1,275 @@
+# 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
+
+       # Musl fixes
+       "${FILESDIR}"/${PN}-2.02.183-fix-stdio-usage.patch
+       "${FILESDIR}"/${PN}-2.02.183-portability.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
+)
+
+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}"
+       )
+       # 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
+       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
+               dolib.a daemons/dmeventd/libdevmapper-event.a
+       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.02.186-r2.ebuild 
b/sys-fs/lvm2/lvm2-2.02.186-r2.ebuild
new file mode 100644
index 0000000..5e94754
--- /dev/null
+++ b/sys-fs/lvm2/lvm2-2.02.186-r2.ebuild
@@ -0,0 +1,283 @@
+# 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
+
+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
+
+       # Musl fixes
+       "${FILESDIR}"/${PN}-2.02.183-fix-stdio-usage.patch
+       "${FILESDIR}"/${PN}-2.02.183-portability.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
+       "${FILESDIR}"/${PN}-2.02.186-udev_remove_unsupported_option.patch 
#700160
+)
+
+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
+               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
+               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"
+}

Reply via email to