From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id CC1B613888F for ; Mon, 12 Oct 2015 12:10:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3F7C7E07F1; Mon, 12 Oct 2015 12:10:00 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C54BBE07F1 for ; Mon, 12 Oct 2015 12:09:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B75B633D3CF for ; Mon, 12 Oct 2015 12:09:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CB7C7EBB for ; Mon, 12 Oct 2015 12:09:54 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1444652138.38555247903d8e7febe60f80eabe22bb76461a05.blueness@gentoo> Subject: [gentoo-commits] proj/musl:master commit in: sys-fs/lvm2/ X-VCS-Repository: proj/musl X-VCS-Files: sys-fs/lvm2/Manifest sys-fs/lvm2/lvm2-2.02.110-r99.ebuild X-VCS-Directories: sys-fs/lvm2/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 38555247903d8e7febe60f80eabe22bb76461a05 X-VCS-Branch: master Date: Mon, 12 Oct 2015 12:09:54 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: a1290319-990c-47ea-93a4-589c5ff8f6ce X-Archives-Hash: b8825bfd4ba593386c75ed32af2c1490 commit: 38555247903d8e7febe60f80eabe22bb76461a05 Author: Anthony G. Basile gentoo org> AuthorDate: Mon Oct 12 12:15:38 2015 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Mon Oct 12 12:15:38 2015 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=38555247 sys-fs/lvm2: drop older version. Package-Manager: portage-2.2.20.1 Manifest-Sign-Key: 0x9384FA6EF52D4BBA sys-fs/lvm2/Manifest | 2 - sys-fs/lvm2/lvm2-2.02.110-r99.ebuild | 275 ----------------------------------- 2 files changed, 277 deletions(-) diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest index 455d02b..48dec37 100644 --- a/sys-fs/lvm2/Manifest +++ b/sys-fs/lvm2/Manifest @@ -25,8 +25,6 @@ AUX lvm2-2.02.99-locale-muck.patch 395 SHA256 14e7c65fd9aa71b7f09cc1aecfaccb3048 AUX lvm2-fix-stdio-usage.patch 3666 SHA256 79c5379cbf660f8dabd45359463c77a40b5a83153b54c67ce36049260dac9071 SHA512 c4d55b366a60926baadf431dd382012eb808490c0bb514e01503d526cfd7ae573efa2d60a92bd5f6f451b54b11fb5cf827f45cec35cfcdee6aa291674cc776dd WHIRLPOOL 48be6a1205c2293fda51bb8b103db0eebe4b28794a6983c910e5761bb50712da4552eb339a485258f0f79032e10aa7589f65411de282f83ab910881c52a356ed AUX lvm2-musl-fixes.patch 1537 SHA256 6516f64faeccaf87641f7c29823344baea0f3af9ac14701e98fa768cbccb703d SHA512 87bd64a0c7525cbf5d49f1fbdd4a86f23bade065362580a1f2ef3b73b5e76e865e620800c922aa6819ace78daf3d4e2ce96b7990c63dcdbf504d03e636d26c00 WHIRLPOOL 9aeabec1f8b0e3487cad583e359c729b5c45ecbc426b48c19260d1f3a8e377fe5e8f09297d893dc2588b9ee11537148558a372c029ac84c02282011cc07440fe AUX lvmetad.initd-2.02.105-r2 405 SHA256 60accb4b6114753232f2db0adf3fc3f46d4459bfedf79b888801a13c55d79fa9 SHA512 d9c6f6c68a83b8f391ded7ebe900009a61ff06e92eb68ccb3dcdc8f41e61bbcdf47246e523ea8cfd6e71790376b316b219d4afaf66cf11477e2b54d526b74998 WHIRLPOOL d959d8c8b5f4ef84c26f8e585fe1761ef9bfd37f590e783e937679a863982e7cc4a4e320c3e2e3bd635dbd3486c15baf7c24e1a21325521f4320e643a57fb0e7 -DIST LVM2.2.02.110.tgz 1487448 SHA256 3dad1aa04a71b8420b15f44c53f041001436539d3f8073490c2d0c52f6fecd11 SHA512 5b4dfa5ed877d34efa5b109dc712e8fa9154b4954b267b0243f1925f9d2fa8c67f4ce8da36a85f3bba6c117f6153fdbf150e3753587ab90584a86d2654dc0812 WHIRLPOOL ea221ed3e9d3f79009d7c341a7a75b52eacc5be79e28f2498e7cdc0f4a97c2bebff405b032eb8086d3b5b5aaf79da2f281c5734562355bddbe6004058e114ced DIST LVM2.2.02.116.tgz 1538340 SHA256 2479d6ea61c405efcfcd8a78390d00c1d2e9c92c0262f3ed599f2c0fb6f0b767 SHA512 992541339637d597257850b4ff7f5348fb7cdcccf806ac8d986a3be1ad1edc5f6bfaedeed5128690c541d1a485cdc75742e90a766363c39867901003518fb84d WHIRLPOOL 1e89ec941882fddba62c9649be46eb5bc6c9cb899669d4bbe4a4a1023c8bf7d8264c4815ef88bb39dedcb9637815411feb826aa102e629d77b80e45e099e398d -EBUILD lvm2-2.02.110-r99.ebuild 9399 SHA256 103ee930b1b327d9f289fb56fe3cf3aca5486ec9a7d9ac11b74e780185494ef0 SHA512 ec67f6ded7801ccd0bcc7ec20387857b0fa150a0e2ccb72c26c0d0c4ccb2f7cb0415bba9b12c4ee6344493dc9f5425bfe146abdee54f8768f888baada8139a86 WHIRLPOOL a4ed116589db6b8d793ca11410acd6cb96eaeb559460693a4a0dda7ab4d1359e4ca0e024c1fe0a8f46fe145e7bb5f27c3ac4fab8dad7da2592233be3dceff27c EBUILD lvm2-2.02.116-r99.ebuild 9329 SHA256 635df4a4a52fa30655ffc5b3936e9fa4e071c056f826c4c4191a3802c5e44dab SHA512 aae8e7a8f5e78d1d026253db9b3ec9a309270d887c99b223d8f756331f50b7ac0b429c31cb39b16fc526c53aa8505c553232d22857fde33290c09a53f41f7a48 WHIRLPOOL 4cb7ac35e2c7a65fcf9477fe6dbd2a9757e0450c7157648a1916efa6957ee3c2d1d1e30f594c551f20511e9661957a5992cc37635eced5119ed592a95fb3d834 MISC metadata.xml 995 SHA256 a2be36b695dab8ef65772af8d808cdc7a5c5855e2c9104060e7232e21b984216 SHA512 642abe2a196ffeaf3a67530befa8dc123f1e3e1238bf55d38c0affea82ab5b2f9e56da6b303410845c625494a59323ac8570f40e0f8a406db76295059958361a WHIRLPOOL cba3a6dd12fafc4719050082ee740d03ef0ed68e074b556a0c1f15f4a7b328d9b826d2b7ab3d3f19546de92e907a3fd466792db67423cb8630d5313154d5b6f2 diff --git a/sys-fs/lvm2/lvm2-2.02.110-r99.ebuild b/sys-fs/lvm2/lvm2-2.02.110-r99.ebuild deleted file mode 100644 index b5ee183..0000000 --- a/sys-fs/lvm2/lvm2-2.02.110-r99.ebuild +++ /dev/null @@ -1,275 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.110.ebuild,v 1.3 2014/08/29 07:15:02 ssuominen Exp $ - -EAPI=5 -inherit autotools eutils linux-info multilib systemd toolchain-funcs udev flag-o-matic - -DESCRIPTION="User-land utilities for LVM2 (device-mapper) software" -HOMEPAGE="http://sources.redhat.com/lvm2/" -SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz - ftp://sources.redhat.com/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm ~mips ppc x86" -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 ) - systemd? ( udev ) - static? ( !udev )" #520450 - -DEPEND_COMMON="clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* ) - readline? ( sys-libs/readline ) - 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/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 -DEPEND="${DEPEND_COMMON} - virtual/pkgconfig - >=sys-devel/binutils-2.20.1-r1 - static? ( - selinux? ( sys-libs/libselinux[static-libs] ) - udev? ( >=virtual/libudev-208:=[static-libs] ) - >=sys-apps/util-linux-2.16[static-libs] - )" - -S=${WORKDIR}/${PN/lvm/LVM}.${PV} - -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() { - # Gentoo specific modification(s): - epatch "${FILESDIR}"/${PN}-2.02.108-example.conf.in.patch - - 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{.in,} || 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 - - # 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 - # Patches for musl - epatch "${FILESDIR}"/${PN}-fix-stdio-usage.patch # Patch from alpine linux - epatch "${FILESDIR}"/${PN}-musl-fixes.patch - - # 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; } - - eautoreconf -} - -src_configure() { - filter-flags -flto - 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" - - # Most of this package does weird stuff. - # The build options are tristate, and --without is NOT supported - # options: 'none', 'internal', 'shared' - if use static; then - buildmode="internal" - # This only causes the .static versions to become available - myconf="${myconf} --enable-static_link" - else - buildmode="shared" - fi - dmbuildmode=$(use !device-mapper-only && echo internal || echo none) - - # dmeventd requires mirrors to be internal, and snapshot available - # so we cannot disable them - myconf="${myconf} --with-mirrors=${dmbuildmode}" - myconf="${myconf} --with-snapshots=${dmbuildmode}" - if use thin; then - myconf="${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}" - done - else - myconf="${myconf} --with-thin=none --with-cache=none" - fi - - if use lvm1; then - myconf="${myconf} --with-lvm1=${buildmode}" - else - myconf="${myconf} --with-lvm1=none" - fi - - # disable O_DIRECT support on hppa, breaks pv detection (#99532) - use hppa && myconf="${myconf} --disable-o_direct" - - if use clvm; then - myconf="${myconf} --with-cluster=${buildmode}" - # 4-state! Make sure we get it right, per bug 210879 - # Valid options are: none, cman, gulm, all - # - # 2009/02: - # gulm is removed now, now dual-state: - # cman, none - # all still exists, but is not needed - # - # 2009/07: - # TODO: add corosync and re-enable ALL - local clvmd="" - use cman && clvmd="cman" - #clvmd="${clvmd/cmangulm/all}" - [ -z "${clvmd}" ] && clvmd="none" - myconf="${myconf} --with-clvmd=${clvmd}" - myconf="${myconf} --with-pool=${buildmode}" - else - myconf="${myconf} --with-clvmd=none --with-cluster=none" - fi - - econf \ - $(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 systemd udev-systemd-background-jobs) \ - "$(systemd_with_unitdir)" \ - ${myconf} \ - CLDFLAGS="${LDFLAGS}" -} - -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 install_systemd_units install_systemd_generators install_tmpfiles_configuration" - 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.67-r1 dmeventd - newinitd "${FILESDIR}"/lvm.rc-2.02.105-r2 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 - fi - - if use clvm; then - newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd - newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd - 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" -}