Fix udev rule for mapper/control device, Bug #295186.

Package-Manager: portage-2.2_rc61/cvs/Linux i686

4 files changed, 260 insertions, 6 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index ba639d83fabb..69a9535a9b80 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,12 @@
 # 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.196 2010/01/02 16:17:57 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.197 2010/01/05 14:30:32 zzam Exp $
+
+*lvm2-2.02.56-r3 (05 Jan 2010)
+
+  05 Jan 2010; Matthias Schwarzott <zzam@gentoo.org>
+  +files/64-device-mapper.rules-2.02.56-r3, +lvm2-2.02.56-r3.ebuild:
+  Fix udev rule for mapper/control device, Bug #295186.
 
   02 Jan 2010; Markus Meier <maekke@gentoo.org> lvm2-2.02.56-r2.ebuild:
   amd64/arm stable, bug #297439
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index a470531b71bb..f90be22a0697 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -4,6 +4,7 @@ Hash: SHA1
 AUX 1.02.22-dmeventd.initd 536 RMD160 2f65a288b735035e6b2451c71ab432a525b19b3a SHA1 5413ad7eaf63a5e7c52f1b21138422f9e4fd6186 SHA256 c9dcee15ce55961e5df7928c350ae1c6db6e78c30d87f7fafa6ba4b016dd9191
 AUX 64-device-mapper.rules-1.02.22-r5 1010 RMD160 3dbb70b60b0c86a77fb9d0e8a0a9cd16a7dd03cc SHA1 fec62b9d4357fe4160e3d017c103767b6c9bf232 SHA256 7c92c2ff3c8dee6588ac51f8367a7b4bcb31d42f2d306ed08ce01be809b9ffcd
 AUX 64-device-mapper.rules-1.02.49-r2 1104 RMD160 61acc7a3f39313df82a82fd4062e8eb10ee384cf SHA1 c6c6fa203982fcfaf11b4c9e4e79c5dd19dda6c3 SHA256 8fb11cac5757f16f67a62e3ee6ec7d986ee77fa020da7589142ac7efd6d24ac2
+AUX 64-device-mapper.rules-2.02.56-r3 1100 RMD160 0c43bc0b970cf755cd40c60c0d3c039fa7c13e4f SHA1 efe4ef6b8e9696c6999db4920fc03d692fa8ecaf SHA256 47b8b713ca809dcd73255c445ce5ef5ec6ba028f7ea685be3a7ba0c36bf38f1c
 AUX clvmd.confd-2.02.39 213 RMD160 d23f8acd6a844e05a3e0da83939513ef0dfab0d8 SHA1 546bfd48a7cfd7e7ffff07861f90e2b8ee29d436 SHA256 68442d5c9da81bad79fa6b1beaede290f24ea6a4e4415f3d9f4e37ccca6c524a
 AUX clvmd.rc-2.02.28-r3 3367 RMD160 eb09f9ef6d9402c9a22ab145ebb64db5f279adc7 SHA1 f15770f0919402f2fbbc7d8441ef3239e6178d0b SHA256 14c1c738b26869877a2bc74f0f8dd0ae4a764976823443db6f5575556285b519
 AUX clvmd.rc-2.02.39 3678 RMD160 50b5ffbf50486a4ca5640344f72e8814c47878db SHA1 7e9e933212e716869e4ba58880bdc526f577cd9b SHA256 9e5ee139b04fd7a691759b84e4d2986752259a4670f1c2f16acb013bf5713b44
@@ -78,13 +79,14 @@ EBUILD lvm2-2.02.51-r3.ebuild 6404 RMD160 21491ed18b10f62cc817638fad0d8b3949ba6c
 EBUILD lvm2-2.02.51.ebuild 6397 RMD160 ca7101385b191a93e6c040f557b8a5366fe97408 SHA1 587651e610252a1741a0f936b350916e8d2ce36b SHA256 6cbe62189ff5996f5fe9ee3b48250eb976befb4318d71b5bb2384265dffcab42
 EBUILD lvm2-2.02.56-r1.ebuild 6515 RMD160 465bc0946b640a75a91cf859a13ee191f55b1576 SHA1 d2093f6b9f5e5eaf2eebaf7a7300498545b22254 SHA256 297d1fc02f295464b41e9164cbab16cb42eb38e233e9a08c5e1a87bc1b170795
 EBUILD lvm2-2.02.56-r2.ebuild 6763 RMD160 e63e33817a12362f3fa1a97efee23c074f9560a7 SHA1 d7416da6f3ee364adc9847d2f23c62d7fbda6bbf SHA256 523aeede49be37645f676a32db113c39ed9ce902561789a1f728cfe9b42fac42
+EBUILD lvm2-2.02.56-r3.ebuild 6766 RMD160 1863d74e7de1aff0e85e321b474da3b5f1c860d4 SHA1 a33d87c7aba6f89b8ccc01fee3a96f129bf0eb22 SHA256 ee0ed901826e5a4731f71c1e84adf6aaa0cba3bd079f4e0166bbaa23ca2ad2f0
 EBUILD lvm2-2.02.56.ebuild 6486 RMD160 3a14e38c19adf2f87e03cf092cb921817e43a029 SHA1 e25b584d20c400c2ad98e0547cdfe907f22ce5ba SHA256 78b5d0ef4ac096bda9926445980582e08ee9b48343720aa5671912c218234a20
-MISC ChangeLog 34329 RMD160 2190539d9f9c25aece0b0f24c63fea7c078c51bb SHA1 2280e4790ecfd15580d126f91301dce1cbe30a12 SHA256 60d6bb1dd5ad12b07c39b07db422c43d904f03dc384e11d31b734f5ad0c07658
+MISC ChangeLog 34538 RMD160 1bc1a83831468f400cbc04b139efd78ea10c161b SHA1 5ea6d0d482fd527f4c7f72efdbd0f064f97c84ae SHA256 9c19dc43eef61edd02edce9b9c4d176024e5ef309e565d7e8fc842d89b0c5ded
 MISC metadata.xml 792 RMD160 f60db9169ee273ca2f97fa5e69d4e5329e988164 SHA1 42f85f30477c65a164a11e172db7e250f442dca5 SHA256 87ced5a3a6102985f7c2a619dd52f65e62ae916f8921c8e7115a25452cd44b7f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.14 (GNU/Linux)
 
-iEYEARECAAYFAks/caQACgkQkKaRLQcq0GL5EwCfULkGTRgp4ZQKf63u95UDmdn2
-Z80An2q7nMg+ErEGgy0GYEsT+3uC8gGd
-=MB3X
+iEYEARECAAYFAktDTQ4ACgkQt2vP6XvVdOd9RwCfZzkmam/ZvEbk/E6bCsL/qkDK
+WcYAoIkHr4Ep851IvAQwnLn/xOSmhP+d
+=AkHs
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/lvm2/files/64-device-mapper.rules-2.02.56-r3 b/sys-fs/lvm2/files/64-device-mapper.rules-2.02.56-r3
new file mode 100644
index 000000000000..7fdf3b1eb575
--- /dev/null
+++ b/sys-fs/lvm2/files/64-device-mapper.rules-2.02.56-r3
@@ -0,0 +1,26 @@
+# do not edit this file, it will be overwritten on update
+
+KERNEL=="device-mapper", NAME="mapper/control"
+
+KERNEL!="dm-*", GOTO="device_mapper_end"
+ACTION!="add|change", GOTO="device_mapper_end"
+
+IMPORT{program}="/sbin/dmsetup info --export -j%M -m%m"
+ENV{DM_NAME}!="?*", GOTO="device_mapper_end"
+NAME="mapper/$env{DM_NAME}", SYMLINK+="%k"
+
+SYMLINK+="disk/by-id/dm-name-$env{DM_NAME}", OPTIONS+="string_escape=replace"
+ENV{DM_UUID}=="?*", SYMLINK+="disk/by-id/dm-uuid-$env{DM_UUID}", OPTIONS+="string_escape=replace"
+
+ENV{DM_SUSPENDED}=="1", GOTO="device_mapper_end"
+ENV{DM_EXISTS}=="0", GOTO="device_mapper_end"
+ENV{DM_TARGET_TYPES}=="|*error*", GOTO="device_mapper_end"
+
+IMPORT{program}="/sbin/blkid -o udev -p $tempnode"
+OPTIONS+="link_priority=-100"
+OPTIONS+="watch"
+ENV{DM_TARGET_TYPES}=="*snapshot-origin*", OPTIONS+="link_priority=-90"
+ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
+ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
+
+LABEL="device_mapper_end"
diff --git a/sys-fs/lvm2/lvm2-2.02.56-r3.ebuild b/sys-fs/lvm2/lvm2-2.02.56-r3.ebuild
new file mode 100644
index 000000000000..c3a55f905f18
--- /dev/null
+++ b/sys-fs/lvm2/lvm2-2.02.56-r3.ebuild
@@ -0,0 +1,220 @@
+# 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.56-r3.ebuild,v 1.1 2010/01/05 14:30:32 zzam 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="!!sys-fs/device-mapper
+	clvm? ( =sys-cluster/dlm-2*
+		cman? ( =sys-cluster/cman-2* ) )"
+
+RDEPEND="${DEPEND}
+	!<sys-apps/openrc-0.4
+	!!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.56-dmeventd.patch
+	epatch "${FILESDIR}"/lvm.conf-2.02.56.patch
+	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.56-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=/usr/$(get_libdir) \
+		${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
+
+	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.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"
+}