Version bump (bug #376749), more docs (bug #378855), USE=static-libs (bug #379039).
authorRobin H. Johnson <robbat2@gentoo.org>
Mon, 5 Sep 2011 17:41:04 +0000 (17:41 +0000)
committerRobin H. Johnson <robbat2@gentoo.org>
Mon, 5 Sep 2011 17:41:04 +0000 (17:41 +0000)
Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64

sys-fs/lvm2/ChangeLog
sys-fs/lvm2/Manifest
sys-fs/lvm2/lvm2-2.02.88.ebuild [new file with mode: 0644]

index e716cd8fe21a11919362dbe7131b4a858639106d..d6a46d0757bf3f54afb2a227c7bbca3cb86f7309 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/lvm2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.246 2011/07/29 08:14:15 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.247 2011/09/05 17:41:04 robbat2 Exp $
+
+*lvm2-2.02.88 (05 Sep 2011)
+
+  05 Sep 2011; Robin H. Johnson <robbat2@gentoo.org> +lvm2-2.02.88.ebuild:
+  Version bump (bug #376749), more docs (bug #378855), USE=static-libs (bug
+  #379039).
 
   29 Jul 2011; Zac Medico <zmedico@gentoo.org> lvm2-2.02.85.ebuild:
   Add ~x86-linux keyword.
index 39dcee4e470042a90e10fe14b05aab486322779e..9aa59ca473a56e855bc87c31fbd6ce308e5c971a 100644 (file)
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 1.02.22-dmeventd.initd 536 RMD160 2f65a288b735035e6b2451c71ab432a525b19b3a SHA1 5413ad7eaf63a5e7c52f1b21138422f9e4fd6186 SHA256 c9dcee15ce55961e5df7928c350ae1c6db6e78c30d87f7fafa6ba4b016dd9191
 AUX 64-device-mapper.rules-1.02.22-r5 1010 RMD160 3dbb70b60b0c86a77fb9d0e8a0a9cd16a7dd03cc SHA1 fec62b9d4357fe4160e3d017c103767b6c9bf232 SHA256 7c92c2ff3c8dee6588ac51f8367a7b4bcb31d42f2d306ed08ce01be809b9ffcd
 AUX 64-device-mapper.rules-1.02.49-r2 1104 RMD160 61acc7a3f39313df82a82fd4062e8eb10ee384cf SHA1 c6c6fa203982fcfaf11b4c9e4e79c5dd19dda6c3 SHA256 8fb11cac5757f16f67a62e3ee6ec7d986ee77fa020da7589142ac7efd6d24ac2
@@ -82,6 +79,7 @@ DIST LVM2.2.02.74.tgz 943084 RMD160 e5cb2a9e304c4075f05aecd03d67aa53eda9e43e SHA
 DIST LVM2.2.02.83.tgz 980283 RMD160 a00326ac4390f564989cc0796f69fed578673179 SHA1 478e0e2756150b201dd32a33eecb41aeb396fe9f SHA256 7c1e0e9d0001ae11422d34ba16666c7852013384992dec576c309395b392dee5
 DIST LVM2.2.02.84.tgz 980421 RMD160 82fba27c00dcffe293288b644cf8a4a2d6680c92 SHA1 6d92f4474f93c7d3824a0eb3469c7e4f9ef8f1d4 SHA256 9238f3400208f26c0e5be896dd3bf41c4d515ab534de23aae8ef4d6ad0d3576d
 DIST LVM2.2.02.85.tgz 1000194 RMD160 720db32d0b1c3d3803075b543f3ffd09aef54ff1 SHA1 43ba2a3be84b2e897ae6b47b0b0be7e212216be7 SHA256 e5c2b0d76e7b1df7630e211734eb09697d66ab879b17eb19545cb77272813eb7
+DIST LVM2.2.02.88.tgz 1029151 RMD160 a5918c6dfef8300b8ad9ab53e913ab487a051436 SHA1 05a4fb09cb5e3d680ad1b268c941968853fb1979 SHA256 a129d1d3949524da7d6d2a67218254baea02df06a6744faa5808a4182b2fb432
 EBUILD lvm2-2.01.13.ebuild 1470 RMD160 125ecf8a32609d67876e16afa155aa256bdc22ee SHA1 95c96a2158c40bc325da6eeaded050e9e426a0e5 SHA256 b3ee4c923da035604cdf69673c12824c7b74a1716550496ce38d9281d39fa6ef
 EBUILD lvm2-2.02.33-r1.ebuild 4571 RMD160 88ca4fa1c0ce0cc8618785bda4e36a9781294838 SHA1 6cd2a106efd2397e1e500455c71d7ec2a27fdf79 SHA256 235e5590b154d17fc8f3839936ed8ee3ceb43df182c506f1a73082eb842a04f7
 EBUILD lvm2-2.02.33.ebuild 4542 RMD160 b803cbf71bf828503a5d82cb5f4c6294e99fab71 SHA1 4fd433145e8582c9ff7b5682e996e55661397628 SHA256 22ebc15aace1cfce6259aa20162114a9639215763d39ef2b5d3ba657c9bea2d1
@@ -122,12 +120,6 @@ EBUILD lvm2-2.02.74.ebuild 8706 RMD160 495c5b9bc446eabfb6e485e9c010effc24358623
 EBUILD lvm2-2.02.83.ebuild 8726 RMD160 63e4b84622f240b67fe877957563de0e068c3647 SHA1 d8fefdc661cd86febfd9454f9e2087b1596665e5 SHA256 cc18cdd6d63e6ca445fc470a054e887740f3d91c2235e13a631bb38a52a108e2
 EBUILD lvm2-2.02.84.ebuild 8797 RMD160 524b85dedef94030590e4bc6a5b9b2e9f31a6633 SHA1 3e4edeccee6693ed15d4f80260d8d492c960c5fb SHA256 d973bd93ea11ae47fac023841668e0563c3a3921560a62d49a9d5f9cdf1d134e
 EBUILD lvm2-2.02.85.ebuild 8923 RMD160 eaa7f57b4731f5487476b3d38356e6dd2f1cc705 SHA1 8ec6247acd6c4cae6a78993902165df41494aaf0 SHA256 639c2b26ab8565604c9d25ed4c4d54d2406e1e6d136a4cf41082be6cc5cd5ca2
-MISC ChangeLog 43489 RMD160 e87cb9d16a3a29d82c0eef0ff8f9a45bc4ed3c7d SHA1 ed86f0452709625b15c890490031babd2862f861 SHA256 192f8975ad24630a396f54882ca06d93c4f1121e8e39784cb4cc4631b8a52d0c
+EBUILD lvm2-2.02.88.ebuild 9127 RMD160 778f4ecc25a206f5e86c69dcc4d8077c3b152928 SHA1 a549a1c59c85e84e4742ebec7101b345980b8bbf SHA256 84aa6deb3bbe80cf56b16d63f4b9f103c872418ab4c8f5ca3538638a2f8dee4c
+MISC ChangeLog 43682 RMD160 e70beb938e4bbadbccef813a90dbad073a848601 SHA1 f1982fa65c349a3c63e1ef046e3e84be5e214c12 SHA256 0060892830eb5101af2425d11a5dc929b35b67779423bbfe88ec30cef98dfdbd
 MISC metadata.xml 792 RMD160 f60db9169ee273ca2f97fa5e69d4e5329e988164 SHA1 42f85f30477c65a164a11e172db7e250f442dca5 SHA256 87ced5a3a6102985f7c2a619dd52f65e62ae916f8921c8e7115a25452cd44b7f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEARECAAYFAk4ya90ACgkQ/ejvha5XGaM/MgCghq1nszJ5D0sLef5ySDBv3i0D
-2bIAoLp/Aah+uMD02vt134A0UpNTHqmJ
-=DIB2
------END PGP SIGNATURE-----
diff --git a/sys-fs/lvm2/lvm2-2.02.88.ebuild b/sys-fs/lvm2/lvm2-2.02.88.ebuild
new file mode 100644 (file)
index 0000000..7435bc2
--- /dev/null
@@ -0,0 +1,281 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.88.ebuild,v 1.1 2011/09/05 17:41:04 robbat2 Exp $
+
+EAPI=3
+inherit eutils multilib toolchain-funcs autotools linux-info
+
+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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-linux"
+
+IUSE="readline +static +static-libs clvm cman +lvm1 selinux"
+
+DEPEND_COMMON="!!sys-fs/device-mapper
+       clvm? ( =sys-cluster/dlm-2*
+                       cman? ( =sys-cluster/cman-2* ) )
+       >=sys-fs/udev-151-r4"
+
+RDEPEND="${DEPEND_COMMON}
+       !<sys-apps/openrc-0.4
+       !!sys-fs/lvm-user
+       !!sys-fs/clvm
+       >=sys-apps/util-linux-2.16"
+
+# Upgrading to this LVM will break older cryptsetup
+RDEPEND="${RDEPEND}
+               !<sys-fs/cryptsetup-1.1.2"
+
+DEPEND="${DEPEND_COMMON}
+               dev-util/pkgconfig
+               >=sys-devel/binutils-2.20.1-r1"
+
+S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
+
+pkg_setup() {
+       local CONFIG_CHECK="~SYSVIPC"
+       local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
+       check_extra_config
+       # 1. Genkernel no longer copies /sbin/lvm blindly.
+       # 2. There are no longer any linking deps in /usr.
+       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 the filename!"
+       fi
+}
+
+src_unpack() {
+       unpack ${A}
+}
+
+src_prepare() {
+       epatch "${FILESDIR}"/lvm.conf-2.02.67.patch
+
+       # Should not be needed due to upstream re-arrangement of build
+       #epatch "${FILESDIR}"/${PN}-2.02.56-dmeventd.patch
+       # Should not be need with new upstream udev rules
+       #epatch "${FILESDIR}"/${PN}-2.02.56-device-mapper-export-format.patch
+
+       # Merged upstream:
+       #epatch "${FILESDIR}"/${PN}-2.02.51-as-needed.patch
+       # Merged upstream:
+       #epatch "${FILESDIR}"/${PN}-2.02.48-fix-pkgconfig.patch
+       # Merged upstream:
+       #epatch "${FILESDIR}"/${PN}-2.02.51-fix-pvcreate.patch
+       # Fixed differently upstream:
+       #epatch "${FILESDIR}"/${PN}-2.02.51-dmsetup-selinux-linking-fix-r3.patch
+
+       epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
+       epatch "${FILESDIR}"/lvm2-2.02.56-lvm2create_initrd.patch
+       # bug 318513
+       epatch "${FILESDIR}"/${PN}-2.02.64-dmeventd-libs.patch
+       # bug 301331
+       epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch
+       # bug 330373
+       epatch "${FILESDIR}"/${PN}-2.02.73-locale-muck.patch
+       # --as-needed
+       epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch
+       # bug 332905
+       epatch "${FILESDIR}"/${PN}-2.02.72-dynamic-static-ldflags.patch
+       # bug 361429 - merged upstream in .85
+       #epatch "${FILESDIR}"/${PN}-2.02.84-udev-pkgconfig.patch
+
+       # Merged upstream
+       #epatch "${FILESDIR}"/${PN}-2.02.73-asneeded.patch
+
+       eautoreconf
+}
+
+src_configure() {
+       local myconf
+       local buildmode
+
+       myconf="${myconf} --enable-dmeventd"
+       myconf="${myconf} --enable-cmdlib"
+       myconf="${myconf} --enable-applib"
+       myconf="${myconf} --enable-fsadm"
+
+       # 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
+               einfo "Building static LVM, for usage inside genkernel"
+               buildmode="internal"
+               # This only causes the .static versions to become available
+               # For recent systems, there are no linkages against anything in /usr anyway.
+               # We explicitly provide the .static versions so that they can be included in
+               # initramfs environments.
+               myconf="${myconf} --enable-static_link"
+       else
+               ewarn "Building shared LVM, it will not work inside genkernel!"
+               buildmode="shared"
+       fi
+
+       # dmeventd requires mirrors to be internal, and snapshot available
+       # so we cannot disable them
+       myconf="${myconf} --with-mirrors=internal"
+       myconf="${myconf} --with-snapshots=internal"
+
+       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
+
+       myconf="${myconf}
+                       --with-dmeventd-path=/sbin/dmeventd"
+       econf $(use_enable readline) \
+               $(use_enable selinux) \
+               --enable-pkgconfig \
+               --with-confdir="${EPREFIX}/etc" \
+               --sbindir="${EPREFIX}/sbin" \
+               --with-staticdir="${EPREFIX}/sbin" \
+               --libdir="${EPREFIX}/$(get_libdir)" \
+               --with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \
+               --enable-udev_rules \
+               --enable-udev_sync \
+               --with-udevdir="${EPREFIX}/lib/udev/rules.d/" \
+               ${myconf} \
+               CLDFLAGS="${LDFLAGS}" || die
+}
+
+src_compile() {
+       einfo "Doing symlinks"
+       pushd include
+       emake || die "Failed to prepare symlinks"
+       popd
+
+       einfo "Starting main build"
+       emake || die "compile fail"
+}
+
+src_install() {
+       emake DESTDIR="${D}" install || die "Failed to emake install"
+
+       # All of this was change by upstream, and if we don't get any problems, we
+       # can probably drop it in .65
+       #X## Revamp all of our library handling for bug #316571
+       #X## Upstream build script puts a lot of this stuff into /usr/lib regardless of
+       #X## libdir variable.
+       #X#dodir /$(get_libdir)
+       #X## .so -> /$(get_libdir)
+       #X#mv -f "${D}"/usr/lib/lib*.so* "${D}"/$(get_libdir)
+       #X#[[ "$(get_libdir)" != "lib" ]] && \
+       #X#     mv "${D}"/usr/$(get_libdir)/lib*.so* "${D}"/$(get_libdir)
+       #X## .a -> /usr/$(get_libdir)
+       #X#[[ "$(get_libdir)" != "lib" ]] && \
+       #X#     mv -f "${D}"/usr/lib/lib*.a "${D}"/usr/$(get_libdir)
+       #X## The upstream symlinks are borked. lets rebuild them instead.
+       #X#find "${D}"/{usr,}/{lib,$(get_libdir)} -type l \
+       #X#     | xargs rm -f 2>/dev/null
+       #X#for i in "${D}"/$(get_libdir)/*.so.* ; do
+       #X#     b="${i//*\/}" o="${b/.so.*/.so}"
+       #X#     ln -s "${b}" "${D}/$(get_libdir)/${o}"
+       #X#done
+       #X## Now enable building properly
+       #X#for i in \
+       #X#     libdevmapper-event{,-lvm2{,mirror,snapshot}} \
+       #X#     libdevmapper \
+       #X#     liblvm2{format1,snapshot,cmd,app} \
+       #X#     ; do
+       #X#     gen_usr_ldscript ${i}.so || die
+       #X#done
+
+       dodoc README VERSION WHATS_NEW WHATS_NEW_DM doc/*.{conf,c,txt}
+       insinto /$(get_libdir)/rcscripts/addons
+       newins "${FILESDIR}"/lvm2-start.sh-2.02.67-r1 lvm-start.sh || die
+       newins "${FILESDIR}"/lvm2-stop.sh-2.02.67-r1 lvm-stop.sh || die
+       newinitd "${FILESDIR}"/lvm.rc-2.02.67-r1 lvm || die
+       newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.67-r2 lvm-monitoring || die
+       newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm || die
+       if use clvm; then
+               newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd || die
+               newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd || die
+       fi
+
+       # move shared libs to /lib(64)
+       if use static-libs; then
+               dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a libdevmapper.a"
+               #gen_usr_ldscript libdevmapper.so
+       fi
+
+       dosbin "${S}"/scripts/lvm2create_initrd/lvm2create_initrd
+       doman  "${S}"/scripts/lvm2create_initrd/lvm2create_initrd.8
+       newdoc "${S}"/scripts/lvm2create_initrd/README README.lvm2create_initrd
+
+       insinto /etc
+       doins "${FILESDIR}"/dmtab
+       insinto /$(get_libdir)/rcscripts/addons
+       doins "${FILESDIR}"/dm-start.sh
+
+       # Device mapper stuff
+       newinitd "${FILESDIR}"/device-mapper.rc-2.02.67-r1 device-mapper || die
+       newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper || die
+
+       newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd || die
+       if use static-libs; then
+               dolib.a daemons/dmeventd/libdevmapper-event.a \
+               || die "dolib.a libdevmapper-event.a"
+               #gen_usr_ldscript libdevmapper-event.so
+       fi
+
+       use static-libs || \
+       rm -f "${D}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
+
+       #insinto /etc/udev/rules.d/
+       #newins "${FILESDIR}"/64-device-mapper.rules-2.02.56-r3 64-device-mapper.rules || die
+
+       # do not rely on /lib -> /libXX link
+       sed -e "s-/lib/rcscripts/-/$(get_libdir)/rcscripts/-" -i "${ED}"/etc/init.d/*
+
+       elog "USE flag nocman is deprecated and replaced"
+       elog "with the cman USE flag."
+       elog ""
+       elog "USE flags clvm and cman are masked"
+       elog "by default and need to be unmasked to use them"
+       elog ""
+       elog "If you are using genkernel and root-on-LVM, rebuild the initramfs."
+}
+
+pkg_postinst() {
+       elog "lvm volumes are no longer automatically created for"
+       elog "baselayout-2 users. If you are using baselayout-2, be sure to"
+       elog "run: # rc-update add lvm boot"
+       elog "Do NOT add it if you are using baselayout-1 still."
+}
+
+src_test() {
+       einfo "Testcases disabled because of device-node mucking"
+       einfo "If you want them, compile the package and see ${S}/tests"
+}