Bug #316427: upstream changes to makefiles caused some libraries to not be present...
authorRobin H. Johnson <robbat2@gentoo.org>
Tue, 20 Apr 2010 23:04:25 +0000 (23:04 +0000)
committerRobin H. Johnson <robbat2@gentoo.org>
Tue, 20 Apr 2010 23:04:25 +0000 (23:04 +0000)
Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

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

index 7c4972254a9bb7283e4f95115966c4b9639c04d8..3739bd0a42dfdac071c6e21bac84c8b21ecce244 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/lvm2
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.202 2010/04/20 02:58:00 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.203 2010/04/20 23:04:25 robbat2 Exp $
+
+*lvm2-2.02.63-r1 (20 Apr 2010)
+
+  20 Apr 2010; Robin H. Johnson <robbat2@gentoo.org>
+  +lvm2-2.02.63-r1.ebuild:
+  Bug #316427: upstream changes to makefiles caused some libraries to not be
+  present in / anymore, causing boot failure for users with a split /usr.
 
 *lvm2-2.02.63 (19 Apr 2010)
 
index f3ec446956209cdf1ecf621fa3fd65cd7ca2da9a..9885a991929b678f9d8296321bfbdba694be9e2e 100644 (file)
@@ -80,6 +80,7 @@ EBUILD lvm2-2.02.56-r1.ebuild 6515 RMD160 465bc0946b640a75a91cf859a13ee191f55b15
 EBUILD lvm2-2.02.56-r2.ebuild 6817 RMD160 3af9e5eeba6494c62a7d96e741c617a5694b0433 SHA1 b203e97bb92d83ac808f2cecd21d11f039d2c64f SHA256 24f7f8d079b9cd8b74a6b4acbdb2ee29732f2feadbcfefb00d906e9e3d73dd3a
 EBUILD lvm2-2.02.56-r3.ebuild 6832 RMD160 f37db7d87ba735470f965654d7f15dea0373c027 SHA1 e8f30604b3ac337e974dbea2f0994b9ceff65185 SHA256 6f73480ae96bb3195b0ce8a349e86ac8a15697bc1f80b4742be87ae0645b0b00
 EBUILD lvm2-2.02.56.ebuild 6486 RMD160 3a14e38c19adf2f87e03cf092cb921817e43a029 SHA1 e25b584d20c400c2ad98e0547cdfe907f22ce5ba SHA256 78b5d0ef4ac096bda9926445980582e08ee9b48343720aa5671912c218234a20
+EBUILD lvm2-2.02.63-r1.ebuild 7537 RMD160 7d53615e3e7dc881c46bce8cc7561b7c13fe8694 SHA1 0c040cce770d5f3a01c5ab79f3e85fb388acad25 SHA256 7091615726f6c1f4e5b475781546f502fd49d0ca398833458c4be9e864c90d7f
 EBUILD lvm2-2.02.63.ebuild 7093 RMD160 daf6b145e5269dbfa401303f51baf6f646185239 SHA1 4f98a64c73788c20a8ffc055bfa306dffb14c7b4 SHA256 809702d01c21629a67e29a636175b8318004fc0d1084071bd9646177d49af62f
-MISC ChangeLog 35356 RMD160 2815ea73b4f561621c98f51f3b1f69b90e78a9f5 SHA1 485ecd883a75cb51609b3bb6578c15f942abfe1c SHA256 841597a228c70e787bdedc5fee8f3eb9e7147bb4bfa850cdc3d75c4ef51f8b57
+MISC ChangeLog 35620 RMD160 86562c04b00ecd81e4c01941bac364e64ec86c75 SHA1 1d332c6de2811295fea8f87cc5c5149b5539c1ab SHA256 c7e3fcac2058e9d98dbae6a579cd4c1511a1bc4e1b2121300936666d8477ccb2
 MISC metadata.xml 792 RMD160 f60db9169ee273ca2f97fa5e69d4e5329e988164 SHA1 42f85f30477c65a164a11e172db7e250f442dca5 SHA256 87ced5a3a6102985f7c2a619dd52f65e62ae916f8921c8e7115a25452cd44b7f
diff --git a/sys-fs/lvm2/lvm2-2.02.63-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.63-r1.ebuild
new file mode 100644 (file)
index 0000000..302afce
--- /dev/null
@@ -0,0 +1,244 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.63-r1.ebuild,v 1.1 2010/04/20 23:04:25 robbat2 Exp $
+
+EAPI=2
+inherit eutils multilib toolchain-funcs autotools
+
+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-146-r3 >=sys-fs/udev-151-r2 )"
+
+RDEPEND="${DEPEND_COMMON}
+       !<sys-apps/openrc-0.4
+       !!sys-fs/lvm-user
+       !!sys-fs/clvm
+       >=sys-apps/util-linux-2.16"
+
+DEPEND="${DEPEND_COMMON}
+               dev-util/pkgconfig"
+
+S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
+
+pkg_setup() {
+       # 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.56.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
+
+       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"
+       econf $(use_enable readline) \
+               $(use_enable selinux) \
+               --enable-pkgconfig \
+               --libdir=/$(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
+
+       # Upstream build script puts a lot of this stuff into /usr/lib regardless of
+       # libdir variable
+       dodir /$(get_libdir)
+       # Put these in root so we can reach before /usr is up
+       for i in \
+               libdevmapper-event{,-lvm2{,mirror,snapshot}} \
+               libdevmapper-event \
+               libdevmapper \
+               liblvm2{format1,snapshot,cmd,app} \
+               ; do
+               for d in $(get_libdir) lib ; do
+                       b="${D}"/usr/${d}/${i}
+                       #einfo "$i in $d : $b"
+                       if [ -n "$(ls "${b}".so* 2>/dev/null)" ]; then
+                               [ -s "$b.so" ] && rm -f $b
+                               mv -f "${b}".so* "${D}"/$(get_libdir) || die
+                               gen_usr_ldscript ${i}.so || die
+                       fi
+                       if [ "$d" != "$(get_libdir)" -a -f "${b}.a" ]; then
+                               mv -f "${b}.a" "${D}"/usr/$(get_libdir) || die
+                       fi
+               done
+               for d in $(get_libdir) lib ; do
+                       b="${D}"/${d}/${i}
+                       [ -s "$b.so" ] && rm -f $b
+               done
+       done
+
+       dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt}
+       insinto /$(get_libdir)/rcscripts/addons
+       newins "${FILESDIR}"/lvm2-start.sh-2.02.49-r3 lvm-start.sh || die
+       newins "${FILESDIR}"/lvm2-stop.sh-2.02.49-r3 lvm-stop.sh || die
+       newinitd "${FILESDIR}"/lvm.rc-2.02.51-r2 lvm || 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-1.02.51-r2 device-mapper || die
+       newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper || die
+
+       newinitd "${FILESDIR}"/1.02.22-dmeventd.initd 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"
+}