Bug #283983: pvcreate hangs on 2.6.30/.31 presently, waiting for a new release from upstream.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

4 files changed, 326 insertions, 2 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index b0f410475899..89b391e40f05 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/lvm2
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.171 2009/09/07 13:41:34 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.172 2009/09/14 08:24:44 robbat2 Exp $
+
+*lvm2-2.02.51-r1 (14 Sep 2009)
+
+  14 Sep 2009; Robin H. Johnson <robbat2@gentoo.org>
+  +lvm2-2.02.51-r1.ebuild, +files/lvm2-2.02.51-fix-pvcreate.patch:
+  Bug #283983: pvcreate hangs on 2.6.30/.31 presently, waiting for a new
+  release from upstream.
 
   07 Sep 2009; Raúl Porcel <armin76@gentoo.org> lvm2-2.02.51.ebuild:
   Add ~arm wrt #283099
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 05f8f5b8eced..77951b945fff 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -22,6 +22,7 @@ AUX lvm2-2.02.48-fix-pkgconfig.patch 1397 RMD160 1b877f041eebcf9af9a4ba15c0d8230
 AUX lvm2-2.02.49-lockdir-override.patch 16498 RMD160 b1596accbd838f43960c5f8b667b30ccf4bacfcb SHA1 cbd3ef9d4e892d776ed51eda1b8d275caaa53d8d SHA256 0ce59c669f1886f49861ea771d40b34650c257c7f8e9f9cf370075ed4e447cf7
 AUX lvm2-2.02.51-as-needed.patch 7750 RMD160 a40917f69f20359bc3ddb7cce1d28851a9bdd152 SHA1 506ddb18fd44d225936c2ab1b642b7162e26f09b SHA256 872495767e184baf412de65b61b8603cfcee2c5728eeca431bd6d53569cdc18f
 AUX lvm2-2.02.51-device-mapper-export-format.patch 11318 RMD160 f194ef2dd9105ba32abef39f36eefe5f01353288 SHA1 a89e39f1bd104ba13d666aff6b13b7cd5f6b388a SHA256 1a2014a6bd259d1fdbd7dd16d3d2c7f7549f6d063b78394816c738ff1611b01e
+AUX lvm2-2.02.51-fix-pvcreate.patch 3140 RMD160 c707cc280a893350a90c1258b0d73c154283738c SHA1 34c16b3a930ae2ab66ca3ea5b47ce19317de51d7 SHA256 7564a9ac374f53e3991f76967f1462709afa9661de4d2c6ff232f71d3d7b446f
 AUX lvm2-start.sh 1025 RMD160 fa27385e4640d59c33f2ca42db9d38f80def3977 SHA1 83a86ff292192b3f62e4686b70bbbfcc39158b53 SHA256 8c7da13b6326a383888110b25f53a4902cbec7d0dace274b9c5f1d6b0a775039
 AUX lvm2-start.sh-2.02.28-r2 1180 RMD160 3ec85899a19c56d4d49e4654e1b05f53bc7d9c93 SHA1 80fce53cc1925990fbb103e57314b3c1740de6ed SHA256 a891855ed04d4c59f17fc0b19dc61813a4ca3cc183166867606d92cb58498460
 AUX lvm2-start.sh-2.02.49-r1 1200 RMD160 b88e37e7e228fecdedf359c1132723077a3d4c94 SHA1 85eb83a83c598b3ea405ec4c597a9c77364e7fb4 SHA256 94d15b5dbeabb275b4d91b284b3113cd812b7e7c90ec3018693803b3e91d9535
@@ -58,6 +59,7 @@ EBUILD lvm2-2.02.49-r1.ebuild 6379 RMD160 2028e7751c0f67812ebfe976c5ce87db9c2b90
 EBUILD lvm2-2.02.49-r2.ebuild 6407 RMD160 ced98313d0b6847c57039d7672654058a443f349 SHA1 ae1db488bdcc364039ac0a547d68e77c60f8fc2e SHA256 5334f7cf9646913dfed4134a352f06b65465db99ca18b10ecc7e81a0f4041175
 EBUILD lvm2-2.02.49-r3.ebuild 6346 RMD160 ab2ffabfae58fdd17b333d2f46c8040b44e3b106 SHA1 18e54caba1be1bafdb9ca799d142ffabcd855089 SHA256 60e8794167d67d4a2e0bfa6848ac575bc5083ad30a3a3058277fc903f566f591
 EBUILD lvm2-2.02.49.ebuild 6314 RMD160 48a0e770600e3ed630bcb3f78aa5d24cddd52b45 SHA1 2f12f037b0284f55597cf37002c5d7df05c44f70 SHA256 192d865d4e5e1118f16041901260ecf27ca6aa2210719e529bcdcb8ab028532e
+EBUILD lvm2-2.02.51-r1.ebuild 6406 RMD160 07d71b56110ec0220688fe504d670d5a94afac96 SHA1 836518d57ec3fe89c72f55b0a6ef7f19992ed057 SHA256 81f6abad1c7ffcecdb9f4b9dae0eb7833f61138c82584ce07f93f89ae9862bc2
 EBUILD lvm2-2.02.51.ebuild 6348 RMD160 43c73f61c86e4b61b2eddfc15db1ac9744988627 SHA1 14a5b11e3dc1ff1d893fb0e680901be7525316ce SHA256 0e5cf3fc675542499452467e47c4eb92eade6757fb8f562827281d83d319ac4a
-MISC ChangeLog 28700 RMD160 ba10b997ce2f138f1bfdcc9a53b57d08351930b2 SHA1 d303e4b196d977a5f0bc5a637143dee71e5583d4 SHA256 24f87c0ad4470891876d979e775ab47a932443622df3c51ff1a70ab50873a6e9
+MISC ChangeLog 28951 RMD160 4190663361042ac91e39141a02f51e0d1caa5f2e SHA1 3d9871a9aa9ff24130d397bba78240834e5ceb03 SHA256 e137e9bc34cc51978e74022223610583f17402926adfdf60b4250cea97638e8f
 MISC metadata.xml 792 RMD160 f60db9169ee273ca2f97fa5e69d4e5329e988164 SHA1 42f85f30477c65a164a11e172db7e250f442dca5 SHA256 87ced5a3a6102985f7c2a619dd52f65e62ae916f8921c8e7115a25452cd44b7f
diff --git a/sys-fs/lvm2/files/lvm2-2.02.51-fix-pvcreate.patch b/sys-fs/lvm2/files/lvm2-2.02.51-fix-pvcreate.patch
new file mode 100644
index 000000000000..370ab6d5ad11
--- /dev/null
+++ b/sys-fs/lvm2/files/lvm2-2.02.51-fix-pvcreate.patch
@@ -0,0 +1,98 @@
+Upstream patch:
+https://www.redhat.com/archives/lvm-devel/2009-August/msg00106.html
+
+# ===================================================================
+# RCS file: /cvs/lvm2/LVM2/WHATS_NEW,v
+# retrieving revision 1.1241
+# retrieving revision 1.1242
+# diff -u -r1.1241 -r1.1242
+# --- LVM2/WHATS_NEW	2009/08/13 17:16:38	1.1241
+# +++ LVM2/WHATS_NEW	2009/08/19 15:34:33	1.1242
+# @@ -1,5 +1,6 @@
+#  Version 2.02.52 -
+#  =================================
+# +  Fix pvcreate on a partition (2.02.51).
+#    Fix vgcfgrestore error paths when locking fails (2.02.49).
+#    Added configure --enable-clogd to conditionally build the cluster log daemon.
+#    Make lvchange --refresh only take a read lock on volume group.
+# ===================================================================
+# RCS file: /cvs/lvm2/LVM2/lib/device/dev-md.c,v
+# retrieving revision 1.18
+# retrieving revision 1.19
+diff -u -r1.18 -r1.19
+--- LVM2/lib/device/dev-md.c	2009/08/01 17:14:52	1.18
++++ LVM2/lib/device/dev-md.c	2009/08/19 15:34:43	1.19
+@@ -137,13 +137,15 @@
+ 	if (!sysfs_dir || !*sysfs_dir)
+ 		return ret;
+ 
+-check_md_major:
+-	if (MAJOR(dev) != md_major()) {
+-		if (get_primary_dev(sysfs_dir, blkdev, &dev))
+-			goto check_md_major;
+-		return ret;
++	if (MAJOR(dev) == blkext_major()) {
++		/* lookup parent MD device from blkext partition */
++		if (!get_primary_dev(sysfs_dir, blkdev, &dev))
++			return ret;
+ 	}
+ 
++	if (MAJOR(dev) != md_major())
++		return ret;
++
+ 	ret = dm_snprintf(path, size, "%s/dev/block/%d:%d/md/%s", sysfs_dir,
+ 			  (int)MAJOR(dev), (int)MINOR(dev), attribute);
+ 	if (ret < 0) {
+===================================================================
+RCS file: /cvs/lvm2/LVM2/lib/filters/filter.c,v
+retrieving revision 1.48
+retrieving revision 1.49
+diff -u -r1.48 -r1.49
+--- LVM2/lib/filters/filter.c	2009/07/09 22:34:02	1.48
++++ LVM2/lib/filters/filter.c	2009/08/19 15:34:46	1.49
+@@ -38,6 +38,7 @@
+ } device_info_t;
+ 
+ static int _md_major = -1;
++static int _blkext_major = -1;
+ static int _device_mapper_major = -1;
+ 
+ int md_major(void)
+@@ -45,6 +46,11 @@
+ 	return _md_major;
+ }
+ 
++int blkext_major(void)
++{
++	return _blkext_major;
++}
++
+ /*
+  * Devices are only checked for partition tables if their minor number
+  * is a multiple of the number corresponding to their type below
+@@ -197,6 +203,10 @@
+ 		if (!strncmp("md", line + i, 2) && isspace(*(line + i + 2)))
+ 			_md_major = line_maj;
+ 
++		/* Look for blkext device */
++		if (!strncmp("blkext", line + i, 6) && isspace(*(line + i + 6)))
++			_blkext_major = line_maj;
++
+ 		/* Look for device-mapper device */
+ 		/* FIXME Cope with multiple majors */
+ 		if (!strncmp("device-mapper", line + i, 13) && isspace(*(line + i + 13)))
+===================================================================
+RCS file: /cvs/lvm2/LVM2/lib/filters/filter.h,v
+retrieving revision 1.15
+retrieving revision 1.16
+diff -u -r1.15 -r1.16
+--- LVM2/lib/filters/filter.h	2007/08/20 20:55:25	1.15
++++ LVM2/lib/filters/filter.h	2009/08/19 15:34:46	1.16
+@@ -36,6 +36,7 @@
+ void lvm_type_filter_destroy(struct dev_filter *f);
+ 
+ int md_major(void);
++int blkext_major(void);
+ int max_partitions(int major);
+ 
+ #endif
diff --git a/sys-fs/lvm2/lvm2-2.02.51-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.51-r1.ebuild
new file mode 100644
index 000000000000..c16e60755633
--- /dev/null
+++ b/sys-fs/lvm2/lvm2-2.02.51-r1.ebuild
@@ -0,0 +1,217 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.51-r1.ebuild,v 1.1 2009/09/14 08:24:44 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 ~sparc ~x86"
+
+IUSE="readline +static clvm cman +lvm1 selinux"
+
+DEPEND="!sys-fs/device-mapper
+	clvm? ( =sys-cluster/dlm-2*
+		cman? ( =sys-cluster/cman-2* ) )"
+
+RDEPEND="${DEPEND}
+	!sys-fs/lvm-user
+	!sys-fs/clvm
+	>=sys-apps/util-linux-2.16"
+
+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}"/${PN}-2.02.45-dmeventd.patch
+	epatch "${FILESDIR}"/lvm.conf-2.02.51.patch
+	epatch "${FILESDIR}"/${PN}-2.02.51-device-mapper-export-format.patch
+	epatch "${FILESDIR}"/${PN}-2.02.51-as-needed.patch
+	epatch "${FILESDIR}"/${PN}-2.02.48-fix-pkgconfig.patch
+	epatch "${FILESDIR}"/${PN}-2.02.51-fix-pvcreate.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=/usr/$(get_libdir) \
+		${myconf} \
+		CLDFLAGS="${LDFLAGS}" || die
+}
+
+src_compile() {
+	einfo "Doing symlinks"
+	pushd include
+	emake || die "Failed to prepare symlinks"
+	popd
+
+	einfo "Doing device-mapper"
+	pushd libdm
+	emake || die "failed to build libdm"
+	#emake ioctl/libdevmapper.a || die "failed to build libdm/ioctl/libdevmapper.a"
+	popd
+
+	einfo "Doing lib"
+	pushd lib
+	emake || die "failed to build lib"
+	popd
+
+	einfo "Doing main build"
+	emake || die "compile problem"
+}
+
+src_install() {
+	emake DESTDIR="${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="${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.28-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)
+	if use static; then
+		dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a libdevmapper.a"
+	fi
+	#gen_usr_ldscript libdevmapper.so
+
+	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.22-r3 device-mapper || die
+	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper || die
+
+	newinitd "${FILESDIR}"/1.02.22-dmeventd.initd dmeventd || die
+	if use static; then
+		dolib.a daemons/dmeventd/libdevmapper-event.a \
+		|| die "dolib.a libdevmapper-event.a"
+	fi
+	#gen_usr_ldscript libdevmapper-event.so
+
+	insinto /etc/udev/rules.d/
+	newins "${FILESDIR}"/64-device-mapper.rules-1.02.49-r2 64-device-mapper.rules || die
+
+	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 "Rebuild your genkernel initramfs if you are using lvm"
+}
+
+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"
+}