diff options
| -rw-r--r-- | sys-fs/lvm2/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-fs/lvm2/files/lvm.conf-2.02.36.patch | 89 | ||||
| -rw-r--r-- | sys-fs/lvm2/lvm2-2.02.36.ebuild | 146 |
3 files changed, 242 insertions, 1 deletions
diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog index 83d47af34953..85198c50f722 100644 --- a/sys-fs/lvm2/ChangeLog +++ b/sys-fs/lvm2/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-fs/lvm2 # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.133 2008/03/14 10:33:39 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.134 2008/04/30 06:53:24 robbat2 Exp $ + +*lvm2-2.02.36 (30 Apr 2008) + + 30 Apr 2008; Robin H. Johnson <robbat2@gentoo.org> + +files/lvm.conf-2.02.36.patch, +lvm2-2.02.36.ebuild: + Version bump per bug 219091. 14 Mar 2008; Christian Heim <phreak@gentoo.org> metadata.xml: Removing Eric Edgar (rocket, #78547) from metadata.xml. diff --git a/sys-fs/lvm2/files/lvm.conf-2.02.36.patch b/sys-fs/lvm2/files/lvm.conf-2.02.36.patch new file mode 100644 index 000000000000..98ac3c1e7b1b --- /dev/null +++ b/sys-fs/lvm2/files/lvm.conf-2.02.36.patch @@ -0,0 +1,89 @@ +diff -Nuar --exclude '*.orig' LVM2.2.02.36.orig/doc/example.conf LVM2.2.02.36/doc/example.conf +--- LVM2.2.02.36.orig/doc/example.conf 2008-04-10 11:50:37.000000000 -0700 ++++ LVM2.2.02.36/doc/example.conf 2008-04-29 23:45:08.165059223 -0700 +@@ -50,7 +50,9 @@ + + + # By default we accept every block device: +- filter = [ "a/.*/" ] ++ # Gentoo: we exclude /dev/nbd by default, because it makes a lot of kernel ++ # noise when you probed while not available. ++ filter = [ "r|/dev/nbd.*|", "a/.*/" ] + + # Exclude the cdrom drive + # filter = [ "r|/dev/cdrom|" ] +@@ -86,7 +88,7 @@ + # If sysfs is mounted (2.6 kernels) restrict device scanning to + # the block devices it believes are valid. + # 1 enables; 0 disables. +- sysfs_scan = 1 ++ sysfs_scan = 1 + + # By default, LVM2 will ignore devices used as components of + # software RAID (md) devices by looking for md superblocks. +@@ -219,12 +221,14 @@ + # e.g. vgscan.lvm1 and they will stop working after you start using + # the new lvm2 on-disk metadata format. + # The default value is set when the tools are built. +- # fallback_to_lvm1 = 0 ++ # Gentoo: the LVM tools are a seperate package. ++ fallback_to_lvm1 = 0 + + # The default metadata format that commands should use - "lvm1" or "lvm2". + # The command line override is -M1 or -M2. + # Defaults to "lvm1" if compiled in, else "lvm2". +- # format = "lvm1" ++ # Gentoo: default to LVM2 format ++ format = "lvm2" + + # Location of proc filesystem + proc = "/proc" +@@ -351,12 +355,12 @@ + + # Metadata settings + # +-# metadata { ++metadata { + # Default number of copies of metadata to hold on each PV. 0, 1 or 2. + # You might want to override it from the command line with 0 + # when running pvcreate on new PVs which are to be added to large VGs. +- +- # pvmetadatacopies = 1 ++ # Gentoo: enabled for data safety ++ pvmetadatacopies = 2 + + # Approximate default size of on-disk metadata areas in sectors. + # You should increase this if you have large volume groups or +@@ -378,11 +382,11 @@ + # the supplied toolset to make changes (e.g. vgcfgrestore). + + # dirs = [ "/etc/lvm/metadata", "/mnt/disk2/lvm/metadata2" ] +-#} ++} + + # Event daemon +-# +-# dmeventd { ++# Gentoo: uncommented, since we provide the dmeventd init script ++dmeventd { + # mirror_library is the library used when monitoring a mirror device. + # + # "libdevmapper-event-lvm2mirror.so" attempts to recover from +@@ -390,7 +394,7 @@ + # reconfigures a mirror as necessary. If no mirror library is + # provided, mirrors are not monitored through dmeventd. + +- # mirror_library = "libdevmapper-event-lvm2mirror.so" ++ mirror_library = "libdevmapper-event-lvm2mirror.so" + + # snapshot_library is the library used when monitoring a snapshot device. + # +@@ -399,6 +403,6 @@ + # snapshot exceedes 80%. The warning is repeated when 85%, 90% and + # 95% of the snapshot are filled. + +- # snapshot_library = "libdevmapper-event-lvm2snapshot.so" +-#} ++ snapshot_library = "libdevmapper-event-lvm2snapshot.so" ++} + diff --git a/sys-fs/lvm2/lvm2-2.02.36.ebuild b/sys-fs/lvm2/lvm2-2.02.36.ebuild new file mode 100644 index 000000000000..a43ac898ac84 --- /dev/null +++ b/sys-fs/lvm2/lvm2-2.02.36.ebuild @@ -0,0 +1,146 @@ +# Copyright 1999-2008 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.36.ebuild,v 1.1 2008/04/30 06:53:24 robbat2 Exp $ + +inherit eutils multilib + +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" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" + +IUSE="readline static clvm cman gulm lvm1 selinux" + +DEPEND=">=sys-fs/device-mapper-1.02.24 + clvm? ( >=sys-cluster/dlm-1.01.00 + cman? ( >=sys-cluster/cman-1.01.00 ) + gulm? ( >=sys-cluster/gulm-1.00.00 ) )" + +RDEPEND="${DEPEND} + !sys-fs/lvm-user + !sys-fs/clvm" + +S="${WORKDIR}/${PN/lvm/LVM}.${PV}" + +pkg_setup() { + use nolvmstatic && eerror "USE=nolvmstatic has changed to USE=static via package.use" + use nolvm1 && eerror "USE=nolvm1 has changed to USE=lvm1 via package.use" +} + +src_unpack() { + unpack ${A} + epatch "${FILESDIR}"/lvm.conf-2.02.36.patch +} + +src_compile() { + # Static compile of lvm2 so that the install described in the handbook works + # http://www.gentoo.org/doc/en/lvm2.xml + # fixes http://bugs.gentoo.org/show_bug.cgi?id=84463 + local myconf + local buildmode + + # fsadm is broken, don't include it (2.02.28) + myconf="${myconf} --enable-dmeventd --enable-cmdlib" + + # 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" + myconf="${myconf} --enable-static_link" + buildmode="internal" + 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! + local clvmd="none" + use cman && clvmd="cman" + use gulm && clvmd="${clvmd}gulm" + clvmd="${clvmd/cmangulm/all}" + 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) \ + --libdir=/usr/$(get_libdir) \ + ${myconf} \ + CLDFLAGS="${LDFLAGS}" || die + emake || die "compile problem" +} + +src_install() { + emake DESTDIR="${D}" install + # TODO: At some point in the future, we need to stop installing the static + # as the /sbin/lvm name, and have both variants seperate. + if use static; then + cp -f "${D}"/sbin/lvm.static "${D}"/sbin/lvm \ + || die "Failed to copy lvm.static" + fi + + dodir /$(get_libdir) + # Put these in root so we can reach before /usr is up + for i in libdevmapper-event-lvm2mirror liblvm2{format1,snapshot} ; do + b="${D}"/usr/$(get_libdir)/${i} + if [ -f "${b}".so ]; then + mv -f "${b}".so* "${D}"/$(get_libdir) || die + fi + done + + dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt} + insinto /lib/rcscripts/addons + newins "${FILESDIR}"/lvm2-start.sh-2.02.28-r2 lvm-start.sh || die + newins "${FILESDIR}"/lvm2-stop.sh-2.02.28-r5 lvm-stop.sh || die + newinitd "${FILESDIR}"/lvm.rc-2.02.28-r2 lvm || die + newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm || die + if use clvm; then + newinitd "${FILESDIR}"/clvmd.rc-2.02.28-r3 clvmd || die + fi + + elog "use flag nocman is deprecated and replaced" + elog "with cman and gulm use flags." + elog "" + elog "use flags clvm,cman and gulm are masked" + elog "by default and need to be unmasked to use them" + elog "" + elog "Rebuild your genkernel initramfs if you are using lvm" + use nolvmstatic && \ + elog "USE=nolvmstatic has changed to USE=static via package.use" + use nolvm1 && \ + elog "USE=nolvm1 has changed to USE=lvm1 via package.use" +} + +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" +} + +src_test() { + einfo "Testcases disabled because of device-node mucking" + einfo "If you want them, compile the package and see ${S}/tests" +} |