Install static library again. Add /etc/dmtab and new rc-scripts addon for

setting up DM volumes at boot. Note that this need upcomming baselayout
release.

(Portage version: 2.0.51-r15)

16 files changed, 188 insertions, 31 deletions

diff --git a/sys-libs/device-mapper/ChangeLog b/sys-libs/device-mapper/ChangeLog
index 97b094ea55ab..a4dd73d99bf3 100644
--- a/sys-libs/device-mapper/ChangeLog
+++ b/sys-libs/device-mapper/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-libs/device-mapper
-# Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/device-mapper/ChangeLog,v 1.25 2004/11/25 11:54:40 gmsoft Exp $
+# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/device-mapper/ChangeLog,v 1.26 2005/02/23 04:06:58 azarah Exp $
+
+*device-mapper-1.00.19-r2 (23 Feb 2005)
+
+  23 Feb 2005; Martin Schlemmer <azarah@gentoo.org> +files/dm-start.sh,
+  +files/dmtab, +device-mapper-1.00.19-r2.ebuild:
+  Install static library again. Add /etc/dmtab and new rc-scripts addon for
+  setting up DM volumes at boot. Note that this need upcomming baselayout
+  release.
 
   25 Nov 2004; Guy Martin <gmsoft@gentoo.org> device-mapper-1.00.19-r1.ebuild:
   Stable on hppa.
diff --git a/sys-libs/device-mapper/Manifest b/sys-libs/device-mapper/Manifest
index b915e42fef0f..4856c37b8b70 100644
--- a/sys-libs/device-mapper/Manifest
+++ b/sys-libs/device-mapper/Manifest
@@ -1,22 +1,26 @@
 MD5 b40398d337211df319100224fd719116 ChangeLog 4343
-MD5 3a9edd4f337801f0709f3e9984ab554f device-mapper-1.00.07-r1.ebuild 1134
 MD5 f75078f5d1afd24d23246457a3258d63 device-mapper-1.00.07.ebuild 1034
-MD5 00cc70fb1b624a42fe3ec976f8954505 device-mapper-1.00.08-r1.ebuild 1170
+MD5 8ef457f9ac46b73b855b4a4e5ff9d7d3 metadata.xml 243
+MD5 185ee549e5e75a97822ae08efaeea3b4 device-mapper-1.00.18-r1.ebuild 1189
+MD5 46c80cb1a221bbcf826391bd42ff115b device-mapper-1.00.19-r1.ebuild 1224
 MD5 71c84254d140bd94385b71e87b19e64e device-mapper-1.00.08.ebuild 1070
+MD5 3a9edd4f337801f0709f3e9984ab554f device-mapper-1.00.07-r1.ebuild 1134
+MD5 00cc70fb1b624a42fe3ec976f8954505 device-mapper-1.00.08-r1.ebuild 1170
 MD5 a53a6f3d047e483b2e88af7d78e1e456 device-mapper-1.00.17-r1.ebuild 1190
 MD5 d1248b8f02659e27016958890a57a981 device-mapper-1.00.17.ebuild 1091
-MD5 185ee549e5e75a97822ae08efaeea3b4 device-mapper-1.00.18-r1.ebuild 1189
 MD5 746d59dcbf7699b8a4cfeb2cb57c3241 device-mapper-1.00.18.ebuild 1089
-MD5 46c80cb1a221bbcf826391bd42ff115b device-mapper-1.00.19-r1.ebuild 1224
 MD5 b94ccf4e7c10e41a9167886b85cf3f8c device-mapper-1.00.19.ebuild 1089
-MD5 8ef457f9ac46b73b855b4a4e5ff9d7d3 metadata.xml 243
+MD5 851db5f2417e1fb1e49c1554fe6f1604 device-mapper-1.00.19-r2.ebuild 1354
+MD5 72b46f8a5544fa166e22dd6297071eda files/digest-device-mapper-1.00.08 70
 MD5 b6ee13a8f0d0d9a8600559f997c8ba9d files/digest-device-mapper-1.00.07 70
+MD5 3722791187466d3005f5b7f129c3ed7a files/digest-device-mapper-1.00.17 70
+MD5 0b1b41a601b1d6ab0c8b6ab6fbce21c2 files/dm-start.sh 1225
+MD5 bd2d95d83990e96a2e3a0f48b53d5abd files/digest-device-mapper-1.00.18 70
+MD5 b5dd92354fb75caa4956a92d5aa2e0ea files/digest-device-mapper-1.00.19 70
 MD5 b6ee13a8f0d0d9a8600559f997c8ba9d files/digest-device-mapper-1.00.07-r1 70
-MD5 72b46f8a5544fa166e22dd6297071eda files/digest-device-mapper-1.00.08 70
 MD5 72b46f8a5544fa166e22dd6297071eda files/digest-device-mapper-1.00.08-r1 70
-MD5 3722791187466d3005f5b7f129c3ed7a files/digest-device-mapper-1.00.17 70
 MD5 3722791187466d3005f5b7f129c3ed7a files/digest-device-mapper-1.00.17-r1 70
-MD5 bd2d95d83990e96a2e3a0f48b53d5abd files/digest-device-mapper-1.00.18 70
 MD5 bd2d95d83990e96a2e3a0f48b53d5abd files/digest-device-mapper-1.00.18-r1 70
-MD5 b5dd92354fb75caa4956a92d5aa2e0ea files/digest-device-mapper-1.00.19 70
 MD5 b5dd92354fb75caa4956a92d5aa2e0ea files/digest-device-mapper-1.00.19-r1 70
+MD5 b2bc5804f0ca4be4d5875777f7a25cdb files/dmtab 332
+MD5 b5dd92354fb75caa4956a92d5aa2e0ea files/digest-device-mapper-1.00.19-r2 70
diff --git a/sys-libs/device-mapper/device-mapper-1.00.07-r1.ebuild b/sys-libs/device-mapper/device-mapper-1.00.07-r1.ebuild
index 2f68b1aba7ce..1539f27a5279 100644
--- a/sys-libs/device-mapper/device-mapper-1.00.07-r1.ebuild
+++ b/sys-libs/device-mapper/device-mapper-1.00.07-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/device-mapper/device-mapper-1.00.07-r1.ebuild,v 1.2 2004/11/14 16:00:10 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/device-mapper/device-mapper-1.00.07-r1.ebuild,v 1.3 2005/02/23 04:06:58 azarah Exp $
 
 inherit eutils
 
diff --git a/sys-libs/device-mapper/device-mapper-1.00.07.ebuild b/sys-libs/device-mapper/device-mapper-1.00.07.ebuild
index 4192a43c2e24..c1acf3790afd 100644
--- a/sys-libs/device-mapper/device-mapper-1.00.07.ebuild
+++ b/sys-libs/device-mapper/device-mapper-1.00.07.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/device-mapper/device-mapper-1.00.07.ebuild,v 1.11 2004/11/14 16:00:10 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/device-mapper/device-mapper-1.00.07.ebuild,v 1.12 2005/02/23 04:06:58 azarah Exp $
 
 DESCRIPTION="Device mapper ioctl library for use with LVM2 utilities."
 HOMEPAGE="http://sources.redhat.com/dm/"
diff --git a/sys-libs/device-mapper/device-mapper-1.00.08-r1.ebuild b/sys-libs/device-mapper/device-mapper-1.00.08-r1.ebuild
index 0fe2bd1cbd04..a90e8eb86348 100644
--- a/sys-libs/device-mapper/device-mapper-1.00.08-r1.ebuild
+++ b/sys-libs/device-mapper/device-mapper-1.00.08-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/device-mapper/device-mapper-1.00.08-r1.ebuild,v 1.3 2004/11/14 16:00:10 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/device-mapper/device-mapper-1.00.08-r1.ebuild,v 1.4 2005/02/23 04:06:58 azarah Exp $
 
 inherit eutils
 
diff --git a/sys-libs/device-mapper/device-mapper-1.00.08.ebuild b/sys-libs/device-mapper/device-mapper-1.00.08.ebuild
index 326a9617b661..87df6c4f194b 100644
--- a/sys-libs/device-mapper/device-mapper-1.00.08.ebuild
+++ b/sys-libs/device-mapper/device-mapper-1.00.08.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/device-mapper/device-mapper-1.00.08.ebuild,v 1.9 2004/11/14 16:00:10 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/device-mapper/device-mapper-1.00.08.ebuild,v 1.10 2005/02/23 04:06:58 azarah Exp $
 
 DESCRIPTION="Device mapper ioctl library for use with LVM2 utilities."
 HOMEPAGE="http://sources.redhat.com/dm/"
diff --git a/sys-libs/device-mapper/device-mapper-1.00.17-r1.ebuild b/sys-libs/device-mapper/device-mapper-1.00.17-r1.ebuild
index 665937356d37..8ba2979493e8 100644
--- a/sys-libs/device-mapper/device-mapper-1.00.17-r1.ebuild
+++ b/sys-libs/device-mapper/device-mapper-1.00.17-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/device-mapper/device-mapper-1.00.17-r1.ebuild,v 1.4 2004/11/14 16:00:10 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/device-mapper/device-mapper-1.00.17-r1.ebuild,v 1.5 2005/02/23 04:06:58 azarah Exp $
 
 inherit eutils
 
diff --git a/sys-libs/device-mapper/device-mapper-1.00.17.ebuild b/sys-libs/device-mapper/device-mapper-1.00.17.ebuild
index 4e4c454ddffa..97390397abdb 100644
--- a/sys-libs/device-mapper/device-mapper-1.00.17.ebuild
+++ b/sys-libs/device-mapper/device-mapper-1.00.17.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/device-mapper/device-mapper-1.00.17.ebuild,v 1.8 2004/11/14 16:00:10 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/device-mapper/device-mapper-1.00.17.ebuild,v 1.9 2005/02/23 04:06:58 azarah Exp $
 
 DESCRIPTION="Device mapper ioctl library for use with LVM2 utilities."
 HOMEPAGE="http://sources.redhat.com/dm/"
diff --git a/sys-libs/device-mapper/device-mapper-1.00.18-r1.ebuild b/sys-libs/device-mapper/device-mapper-1.00.18-r1.ebuild
index d3dc49ada489..4421c44668e8 100644
--- a/sys-libs/device-mapper/device-mapper-1.00.18-r1.ebuild
+++ b/sys-libs/device-mapper/device-mapper-1.00.18-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/device-mapper/device-mapper-1.00.18-r1.ebuild,v 1.3 2004/11/14 16:00:10 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/device-mapper/device-mapper-1.00.18-r1.ebuild,v 1.4 2005/02/23 04:06:58 azarah Exp $
 
 inherit eutils
 
diff --git a/sys-libs/device-mapper/device-mapper-1.00.18.ebuild b/sys-libs/device-mapper/device-mapper-1.00.18.ebuild
index e891a7a73425..d55ee5e667da 100644
--- a/sys-libs/device-mapper/device-mapper-1.00.18.ebuild
+++ b/sys-libs/device-mapper/device-mapper-1.00.18.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/device-mapper/device-mapper-1.00.18.ebuild,v 1.3 2004/11/14 16:00:10 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/device-mapper/device-mapper-1.00.18.ebuild,v 1.4 2005/02/23 04:06:58 azarah Exp $
 
 DESCRIPTION="Device mapper ioctl library for use with LVM2 utilities."
 HOMEPAGE="http://sources.redhat.com/dm/"
diff --git a/sys-libs/device-mapper/device-mapper-1.00.19-r1.ebuild b/sys-libs/device-mapper/device-mapper-1.00.19-r1.ebuild
index e2c61bb3792b..19c19c92db37 100644
--- a/sys-libs/device-mapper/device-mapper-1.00.19-r1.ebuild
+++ b/sys-libs/device-mapper/device-mapper-1.00.19-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/device-mapper/device-mapper-1.00.19-r1.ebuild,v 1.5 2004/11/25 11:54:40 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/device-mapper/device-mapper-1.00.19-r1.ebuild,v 1.6 2005/02/23 04:06:58 azarah Exp $
 
 inherit eutils
 
diff --git a/sys-libs/device-mapper/device-mapper-1.00.19-r2.ebuild b/sys-libs/device-mapper/device-mapper-1.00.19-r2.ebuild
new file mode 100644
index 000000000000..1846351187c4
--- /dev/null
+++ b/sys-libs/device-mapper/device-mapper-1.00.19-r2.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/device-mapper/device-mapper-1.00.19-r2.ebuild,v 1.1 2005/02/23 04:06:58 azarah Exp $
+
+inherit eutils
+
+DESCRIPTION="Device mapper ioctl library for use with LVM2 utilities."
+HOMEPAGE="http://sources.redhat.com/dm/"
+SRC_URI="ftp://sources.redhat.com/pub/dm/${PN}.${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ppc ~sparc ~amd64 ppc64 ~alpha hppa"
+IUSE=""
+
+DEPEND="virtual/linux-sources"
+
+S="${WORKDIR}/${PN}.${PV}"
+
+pkg_setup() {
+	if [ ! -e "/usr/src/linux/include/linux/dm-ioctl.h" ] ; then
+		eerror
+		eerror "Your currently linked kernel (/usr/src/linux) hasn't"
+		eerror "been patched for device mapper support."
+		eerror
+		die "kernel not patched for device mapper support"
+	fi
+
+	return 0
+}
+
+src_compile() {
+	econf || die "econf failed"
+
+	# Parallel build doesn't work.
+	emake -j1 || die "compile problem"
+}
+
+src_install() {
+	einstall sbindir="${D}/sbin" \
+		libdir="${D}/$(get_libdir)" || die "install failed"
+
+	# Please do not use $(get_libdir) here again, as it is where it is
+	# _located_, and not to where it is installed!
+	dolib.a ${S}/lib/ioctl/libdevmapper.a
+	# bug #4411
+	gen_usr_ldscript libdevmapper.so || die "gen_usr_ldscript failed"
+
+	insinto /etc
+	doins ${FILESDIR}/dmtab
+	insinto /lib/rcscripts/addons
+	doins ${FILESDIR}/dm-start.sh
+
+	dodoc COPYING* INSTALL INTRO README VERSION WHATS_NEW
+}
diff --git a/sys-libs/device-mapper/device-mapper-1.00.19.ebuild b/sys-libs/device-mapper/device-mapper-1.00.19.ebuild
index af6f9c0ca583..2f22e0ef7448 100644
--- a/sys-libs/device-mapper/device-mapper-1.00.19.ebuild
+++ b/sys-libs/device-mapper/device-mapper-1.00.19.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2004 Gentoo Foundation
+# Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-libs/device-mapper/device-mapper-1.00.19.ebuild,v 1.3 2004/11/14 16:00:10 max Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/device-mapper/device-mapper-1.00.19.ebuild,v 1.4 2005/02/23 04:06:58 azarah Exp $
 
 DESCRIPTION="Device mapper ioctl library for use with LVM2 utilities."
 HOMEPAGE="http://sources.redhat.com/dm/"
diff --git a/sys-libs/device-mapper/files/digest-device-mapper-1.00.19-r2 b/sys-libs/device-mapper/files/digest-device-mapper-1.00.19-r2
new file mode 100644
index 000000000000..689aeecbec74
--- /dev/null
+++ b/sys-libs/device-mapper/files/digest-device-mapper-1.00.19-r2
@@ -0,0 +1 @@
+MD5 a7a97c469f22e3ec2cdcb5aae5603f3f device-mapper.1.00.19.tgz 640411
diff --git a/sys-libs/device-mapper/files/dm-start.sh b/sys-libs/device-mapper/files/dm-start.sh
new file mode 100644
index 000000000000..8aab03c36358
--- /dev/null
+++ b/sys-libs/device-mapper/files/dm-start.sh
@@ -0,0 +1,77 @@
+# /lib/rcscripts/addons/dm-start.sh:  Setup DM volumes at boot
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/device-mapper/files/dm-start.sh,v 1.1 2005/02/23 04:06:58 azarah Exp $
+
+# char **get_new_dm_volumes(void)
+#
+#   Return dmsetup commands to setup volumes 
+get_new_dm_volumes() {
+	local volume params
+	
+	# Filter comments and blank lines
+	grep -v -e '^[[:space:]]*\(#\|$\)' /etc/dmtab | \
+	while read volume params; do
+		# If it exists, skip it
+		dmvolume_exists "${volume%:}" && continue
+		# Assemble the command to run to create volume
+		echo "echo ${params} | /sbin/dmsetup create ${volume%:}"
+	done
+
+	return 0
+}
+
+# int dmvolume_exists(volume)
+#
+#   Return true if volume exists in DM table
+dmvolume_exists() {
+	local x line volume=$1
+
+	[[ -z ${volume} ]] && return 1
+	
+	while read line; do
+		for x in ${line}; do
+			[[ ${x} == "${volume}" ]] && return 0
+			# We only want to check the volume name
+			break
+		done
+	done <<<"$(/sbin/dmsetup ls 2>/dev/null)"
+
+	return 1
+}
+
+# int is_empty_dm_volume(volume)
+#
+#   Return true if the volume exists in DM table, but is empty/non-valid
+is_empty_dm_volume() {
+	local table volume=$1
+	
+	table=$(/sbin/dmsetup table 2>/dev/null | grep -e "^${volume}:")
+	
+	# dmsetup seems to print an space after the colon for the moment
+	[[ -n ${table} && -z ${table/${volume}:*} ]] && return 0
+
+	return 1
+}
+
+source /sbin/functions.sh
+
+if [[ -x /sbin/dmsetup && -c /dev/mapper/control && -f /etc/dmtab ]]; then
+	[[ -n $(get_new_dm_volumes) ]] && \
+		einfo " Setting up device-mapper volumes:"
+
+	while read x; do
+		[[ -n ${x} ]] || continue
+
+		volume="${x##* }"
+
+		ebegin "  Creating volume: ${volume}"
+		if ! eval ${x} &>/dev/null; then
+			eerror "  Error creating volume: ${volume}"
+			# dmsetup still adds an empty volume in some cases,
+			#  so lets remove it
+			is_empty_dm_volume "${volume}" && \
+				/sbin/dmsetup remove "${volume}" &>/dev/null
+		else
+			eend 0
+		fi
+	done <<< "$(get_new_dm_volumes)"
+fi
diff --git a/sys-libs/device-mapper/files/dmtab b/sys-libs/device-mapper/files/dmtab
new file mode 100644
index 000000000000..cd5a88409c6f
--- /dev/null
+++ b/sys-libs/device-mapper/files/dmtab
@@ -0,0 +1,12 @@
+#/etc/dmraid: config file for adding device-mapper volumes at boot
+# $Header: /var/cvsroot/gentoo-x86/sys-libs/device-mapper/files/dmtab,v 1.1 2005/02/23 04:06:58 azarah Exp $
+
+# Format: <volume name>: <table>
+# Example: isw0: 0 312602976 striped 2 128 /dev/sda 0 /dev/sdb 0
+#
+# Alternatively you can create all your volumes the first time, and just run:
+#
+#   dmsetup table >> /etc/dmtab
+#
+# and verify that they are correct.
+