From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1O43f2-0002vv-BY for garchives@archives.gentoo.org; Tue, 20 Apr 2010 02:58:04 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 773CBE0948; Tue, 20 Apr 2010 02:58:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 38664E0948 for ; Tue, 20 Apr 2010 02:58:03 +0000 (UTC) Received: from corvid.gentoo.org (corvid.gentoo.org [208.92.234.79]) (using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id BA8DB1B405A for ; Tue, 20 Apr 2010 02:58:02 +0000 (UTC) Received: by corvid.gentoo.org (Postfix, from userid 544) id 08EEF2C050; Tue, 20 Apr 2010 02:58:00 +0000 (UTC) From: "Robin H. Johnson (robbat2)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, robbat2@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in sys-fs/lvm2: lvm2-2.02.63.ebuild ChangeLog X-VCS-Repository: gentoo-x86 X-VCS-Files: lvm2-2.02.63.ebuild ChangeLog X-VCS-Directories: sys-fs/lvm2 X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson Content-Type: text/plain; charset=utf8 Message-Id: <20100420025801.08EEF2C050@corvid.gentoo.org> Date: Tue, 20 Apr 2010 02:58:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: 3136023e-af12-474e-809a-34071b8f4382 X-Archives-Hash: 4e5ac30c35d5b1eb6c6c25bc820d9a9c robbat2 10/04/20 02:58:00 Modified: ChangeLog Added: lvm2-2.02.63.ebuild Log: Bug #309757, version bump. Now dropping the export-format patchset enti= rely in favour of new lvm2/udev cookie and udev rules from upstream. This= may require us to set a minimum kernel version. (Portage version: 2.2_rc67/cvs/Linux i686) Revision Changes Path 1.202 sys-fs/lvm2/ChangeLog file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/lvm2/Change= Log?rev=3D1.202&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/lvm2/Change= Log?rev=3D1.202&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/lvm2/Change= Log?r1=3D1.201&r2=3D1.202 Index: ChangeLog =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v retrieving revision 1.201 retrieving revision 1.202 diff -p -w -b -B -u -u -r1.201 -r1.202 --- ChangeLog 2 Feb 2010 18:15:22 -0000 1.201 +++ ChangeLog 20 Apr 2010 02:58:00 -0000 1.202 @@ -1,6 +1,14 @@ # 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.201 2010/02= /02 18:15:22 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.202 2010/04= /20 02:58:00 robbat2 Exp $ + +*lvm2-2.02.63 (19 Apr 2010) + + 19 Apr 2010; Robin H. Johnson +lvm2-2.02.63.ebuil= d, + +files/lvm2-2.02.63-always-make-static-libdm.patch: + Bug #309757, version bump. Now dropping the export-format patchset + entirely in favour of new lvm2/udev cookie and udev rules from upstrea= m. + This may require us to set a minimum kernel version. =20 02 Feb 2010; Jeroen Roovers lvm2-2.02.56-r2.ebuild: Stable for HPPA (bug #297439). 1.1 sys-fs/lvm2/lvm2-2.02.63.ebuild file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/lvm2/lvm2-2= .02.63.ebuild?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/lvm2/lvm2-2= .02.63.ebuild?rev=3D1.1&content-type=3Dtext/plain Index: lvm2-2.02.63.ebuild =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D # 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.ebuild,v 1.1 = 2010/04/20 02:58:00 robbat2 Exp $ EAPI=3D2 inherit eutils multilib toolchain-funcs autotools DESCRIPTION=3D"User-land utilities for LVM2 (device-mapper) software." HOMEPAGE=3D"http://sources.redhat.com/lvm2/" SRC_URI=3D"ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz ftp://sources.redhat.com/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz" LICENSE=3D"GPL-2" SLOT=3D"0" KEYWORDS=3D"~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~s= parc ~x86" IUSE=3D"readline +static clvm cman +lvm1 selinux" DEPEND_COMMON=3D"!!sys-fs/device-mapper clvm? ( =3Dsys-cluster/dlm-2* cman? ( =3Dsys-cluster/cman-2* ) ) || ( =3Dsys-fs/udev-146-r3 >=3Dsys-fs/udev-151-r2 )" RDEPEND=3D"${DEPEND_COMMON} !=3Dsys-apps/util-linux-2.16" DEPEND=3D"${DEPEND_COMMON} dev-util/pkgconfig" S=3D"${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=3D"${myconf} --enable-dmeventd" myconf=3D"${myconf} --enable-cmdlib" myconf=3D"${myconf} --enable-applib" myconf=3D"${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=3D"internal" # This only causes the .static versions to become available # For recent systems, there are no linkages against anything in /usr an= yway. # We explicitly provide the .static versions so that they can be includ= ed in # initramfs environments. myconf=3D"${myconf} --enable-static_link" else ewarn "Building shared LVM, it will not work inside genkernel!" buildmode=3D"shared" fi # dmeventd requires mirrors to be internal, and snapshot available # so we cannot disable them myconf=3D"${myconf} --with-mirrors=3Dinternal" myconf=3D"${myconf} --with-snapshots=3Dinternal" if use lvm1 ; then myconf=3D"${myconf} --with-lvm1=3D${buildmode}" else myconf=3D"${myconf} --with-lvm1=3Dnone" fi # disable O_DIRECT support on hppa, breaks pv detection (#99532) use hppa && myconf=3D"${myconf} --disable-o_direct" if use clvm; then myconf=3D"${myconf} --with-cluster=3D${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=3D"" use cman && clvmd=3D"cman" #clvmd=3D"${clvmd/cmangulm/all}" [ -z "${clvmd}" ] && clvmd=3D"none" myconf=3D"${myconf} --with-clvmd=3D${clvmd}" myconf=3D"${myconf} --with-pool=3D${buildmode}" else myconf=3D"${myconf} --with-clvmd=3Dnone --with-cluster=3Dnone" fi myconf=3D"${myconf} --sbindir=3D/sbin --with-staticdir=3D/sbin" econf $(use_enable readline) \ $(use_enable selinux) \ --enable-pkgconfig \ --libdir=3D/usr/$(get_libdir) \ --enable-udev_rules \ --enable-udev_sync \ --with-udevdir=3D/$(get_libdir)/udev/rules.d/ \ ${myconf} \ CLDFLAGS=3D"${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=3D"${D}" install dodir /$(get_libdir) # Put these in root so we can reach before /usr is up for i in \ libdevmapper-event{,-lvm2{mirror,snapshot}} \ libdevmapper \ liblvm2{format1,snapshot,cmd} \ ; do b=3D"${D}"/usr/$(get_libdir)/${i} if [ -f "${b}".so ]; then mv -f "${b}".so* "${D}"/$(get_libdir) || die gen_usr_ldscript ${i}.so || die fi 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 || di= e 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" }