diff options
author | Robin H. Johnson <robbat2@gentoo.org> | 2011-02-09 20:38:39 +0000 |
---|---|---|
committer | Robin H. Johnson <robbat2@gentoo.org> | 2011-02-09 20:38:39 +0000 |
commit | 8c017d3dbdae3d5c77716487cb5c3501e0a70e7f (patch) | |
tree | 13bd9810b8d12496c7a063dcb92eab44f1743dfe /sys-fs/lvm2 | |
parent | Minor fixes as suggested by Mr_Bones and ssuominen. (diff) | |
download | historical-8c017d3dbdae3d5c77716487cb5c3501e0a70e7f.tar.gz historical-8c017d3dbdae3d5c77716487cb5c3501e0a70e7f.tar.bz2 historical-8c017d3dbdae3d5c77716487cb5c3501e0a70e7f.zip |
Version bump, upstream notes essential fix for big-endian users of 2.02.75-2.02.83.
Package-Manager: portage-2.2.0_alpha21/cvs/Linux x86_64
Diffstat (limited to 'sys-fs/lvm2')
-rw-r--r-- | sys-fs/lvm2/ChangeLog | 8 | ||||
-rw-r--r-- | sys-fs/lvm2/Manifest | 4 | ||||
-rw-r--r-- | sys-fs/lvm2/lvm2-2.02.84.ebuild | 271 |
3 files changed, 281 insertions, 2 deletions
diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog index 89582440889d..0955846f06e6 100644 --- a/sys-fs/lvm2/ChangeLog +++ b/sys-fs/lvm2/ChangeLog @@ -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.241 2011/02/04 23:17:07 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.242 2011/02/09 20:38:39 robbat2 Exp $ + +*lvm2-2.02.84 (09 Feb 2011) + + 09 Feb 2011; Robin H. Johnson <robbat2@gentoo.org> +lvm2-2.02.84.ebuild: + Version bump, upstream notes essential fix for big-endian users of + 2.02.75-2.02.83. *lvm2-2.02.83 (04 Feb 2011) diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest index 292cf89df64f..fe2d471c632f 100644 --- a/sys-fs/lvm2/Manifest +++ b/sys-fs/lvm2/Manifest @@ -76,6 +76,7 @@ DIST LVM2.2.02.72.tgz 931612 RMD160 1f537b305f51838a157fdedbdbffb95e566ff4ca SHA DIST LVM2.2.02.73.tgz 937803 RMD160 c06b4c6c64ad37f063f1d8902f227e3de790c438 SHA1 297feef08dced7d64bff9f5f8a47c1916fcb2afa SHA256 9e8295d3ef36b5f56e213f8cb9ac9981cfa02fb2c95fe6879d6012d6128a8fc8 DIST LVM2.2.02.74.tgz 943084 RMD160 e5cb2a9e304c4075f05aecd03d67aa53eda9e43e SHA1 fc6cd04e4a908906c6f596ad99948140728be99c SHA256 a40c80c5b9a2547b8bd63e9321d7037c8bf041a35f734a5766ad2848d80bb697 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 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 @@ -114,5 +115,6 @@ EBUILD lvm2-2.02.73-r1.ebuild 8698 RMD160 299597b5253fd879cbe5735b59deb84fe2a89c EBUILD lvm2-2.02.73.ebuild 8614 RMD160 257fc6784c5c027f487dad7e3c5e4e8fc077976d SHA1 e41bcb1e550b5077b56bb67b36989d13f4fe9d7f SHA256 a09f80dfb1008a9299a7db74c085512ea911ea32690fbc4d76bbdf875556b1e5 EBUILD lvm2-2.02.74.ebuild 8706 RMD160 495c5b9bc446eabfb6e485e9c010effc24358623 SHA1 814c9db645c74500b6e84d057b3b97e1f937b1c2 SHA256 f85a1bb5cff58280af40e37fea329ecbe6a3c7760d8987cef827a0bb68a3a8fb EBUILD lvm2-2.02.83.ebuild 8726 RMD160 63e4b84622f240b67fe877957563de0e068c3647 SHA1 d8fefdc661cd86febfd9454f9e2087b1596665e5 SHA256 cc18cdd6d63e6ca445fc470a054e887740f3d91c2235e13a631bb38a52a108e2 -MISC ChangeLog 42706 RMD160 0d476d73212ea1bd984fc6835cbefa007529c4ba SHA1 d70044e86d4db71c113b61328ed04f2f9d49d4b8 SHA256 58762788b05ad48d5b2a60385f4bc49b63ab011bb06206d4cf1eed1ba17a7041 +EBUILD lvm2-2.02.84.ebuild 8726 RMD160 e88733f068577bcb07dbbbc53fdf110d6954de43 SHA1 a22949f79bcaded58d8e78cee16e6ead445198e8 SHA256 4c514ea9da963de287a405316e626d7a8714e8f1964e207cb9093f3d160c9869 +MISC ChangeLog 42899 RMD160 6cc818029835b83e19a70f15197b67a286f3387c SHA1 89bca5074b8fb2b5ed31031668a87e65db42ac89 SHA256 a1d73d67b372da86e61c4f562cd3a174e09889d5b575eddbd84a068f005cc56d MISC metadata.xml 792 RMD160 f60db9169ee273ca2f97fa5e69d4e5329e988164 SHA1 42f85f30477c65a164a11e172db7e250f442dca5 SHA256 87ced5a3a6102985f7c2a619dd52f65e62ae916f8921c8e7115a25452cd44b7f diff --git a/sys-fs/lvm2/lvm2-2.02.84.ebuild b/sys-fs/lvm2/lvm2-2.02.84.ebuild new file mode 100644 index 000000000000..4f88c4e81074 --- /dev/null +++ b/sys-fs/lvm2/lvm2-2.02.84.ebuild @@ -0,0 +1,271 @@ +# 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.84.ebuild,v 1.1 2011/02/09 20:38:39 robbat2 Exp $ + +EAPI=2 +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" + +IUSE="readline +static 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 + + # 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} + --sbindir=/sbin + --with-staticdir=/sbin + --with-dmeventd-path=/sbin/dmeventd" + econf $(use_enable readline) \ + $(use_enable selinux) \ + --enable-pkgconfig \ + --libdir=/$(get_libdir) \ + --with-usrlibdir=/usr/$(get_libdir) \ + --enable-udev_rules \ + --enable-udev_sync \ + --with-udevdir=/$(get_libdir)/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 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) + dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a libdevmapper.a" + #gen_usr_ldscript libdevmapper.so + + 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 + dolib.a daemons/dmeventd/libdevmapper-event.a \ + || die "dolib.a libdevmapper-event.a" + #gen_usr_ldscript libdevmapper-event.so + + #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 "${D}"/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" +} |