* [gentoo-commits] gentoo-x86 commit in sys-fs/lvm2: ChangeLog lvm2-2.02.83.ebuild
@ 2011-02-04 23:17 Robin H. Johnson (robbat2)
0 siblings, 0 replies; only message in thread
From: Robin H. Johnson (robbat2) @ 2011-02-04 23:17 UTC (permalink / raw
To: gentoo-commits
robbat2 11/02/04 23:17:07
Modified: ChangeLog
Added: lvm2-2.02.83.ebuild
Log:
Version bump.
(Portage version: 2.2.0_alpha19/cvs/Linux x86_64)
Revision Changes Path
1.241 sys-fs/lvm2/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/ChangeLog?rev=1.241&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/ChangeLog?rev=1.241&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/ChangeLog?r1=1.240&r2=1.241
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v
retrieving revision 1.240
retrieving revision 1.241
diff -p -w -b -B -u -u -r1.240 -r1.241
--- ChangeLog 25 Nov 2010 15:32:02 -0000 1.240
+++ ChangeLog 4 Feb 2011 23:17:07 -0000 1.241
@@ -1,6 +1,11 @@
# 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.240 2010/11/25 15:32:02 ranger Exp $
+# 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 $
+
+*lvm2-2.02.83 (04 Feb 2011)
+
+ 04 Feb 2011; Robin H. Johnson <robbat2@gentoo.org> +lvm2-2.02.83.ebuild:
+ Version bump.
25 Nov 2010; Brent Baude <ranger@gentoo.org> lvm2-2.02.73-r1.ebuild:
Marking lvm2-2.02.73-r1 ppc64 for bug 334087
1.1 sys-fs/lvm2/lvm2-2.02.83.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/lvm2-2.02.83.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/lvm2/lvm2-2.02.83.ebuild?rev=1.1&content-type=text/plain
Index: lvm2-2.02.83.ebuild
===================================================================
# 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.83.ebuild,v 1.1 2011/02/04 23:17:07 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"
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2011-02-04 23:17 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-02-04 23:17 [gentoo-commits] gentoo-x86 commit in sys-fs/lvm2: ChangeLog lvm2-2.02.83.ebuild Robin H. Johnson (robbat2)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox