sys-kernel/dracut: Version bump to 009.

Package-Manager: portage-2.1.9.45/cvs/Linux x86_64

5 files changed, 298 insertions, 9 deletions

diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog
index 68a2abc72593..3488b9a8a49e 100644
--- a/sys-kernel/dracut/ChangeLog
+++ b/sys-kernel/dracut/ChangeLog
@@ -1,6 +1,23 @@
 # ChangeLog for sys-kernel/dracut
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.15 2011/03/21 12:39:04 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.16 2011/03/28 23:38:14 aidecoe Exp $
+
+*dracut-009 (28 Mar 2011)
+
+  28 Mar 2011; Amadeusz Żołnowski <aidecoe@gentoo.org> +dracut-009.ebuild,
+  +files/dracut-009-don-t-skip-zero-length-string-outfile.patch,
+  +files/dracut-009-multipath-udev-rules.patch:
+  Version bump.
+
+  This version provides new modules:
+  - biosdevname
+  - caps
+
+  sys-block/open-iscsi is restricted to 2.0.871.3 and above because of required
+  iBFT support which starts with this version.
+
+  net-misc/dhcp restricted to 4.2.1-r1 and above because dhcp-3 doesn't work
+  with Qemu and dhcp-4 is already ~arch keyworded.
 
   21 Mar 2011; Amadeusz Żołnowski <aidecoe@gentoo.org> dracut-002-r1.ebuild,
   dracut-003.ebuild, dracut-004.ebuild, dracut-006.ebuild,
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index a439ab34c945..9ddd0f06d204 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -16,12 +16,15 @@ AUX dracut-007-multipath-udev-rules.patch 1327 RMD160 616179d21a205b477e729e15b0
 AUX dracut-008-dm-udev-rules.patch 2199 RMD160 3aa90576ccf5f01ff65a02e8baaa0357dc8e2f62 SHA1 b4cece3c29679d9f6fca5f2a47e2fe7ecde863c2 SHA256 9d3d91155bda4c6197712b013f1cb7bbc4972555189b72b510d7a8ad038ed27c
 AUX dracut-008-i18n-config-file-parsing-in-hostonly.patch 966 RMD160 3d37f7f3009c6d20c9bb2c6df5dde8ca5a689aba SHA1 236a1e158fe9227e7fcce9365eb8058f6f83666b SHA256 4611c52798c4d5dc585f6cfe72662a5ff5ae5fdb11907638e124bc97bd490968
 AUX dracut-008-multipath-udev-rules.patch 852 RMD160 b215724ca292f6e7faa94f9e29aea3cd910a85be SHA1 5e00b4032c26dfbe794c0dc43b6d783e9f744983 SHA256 464566649128b42d5735b6d4521b01d6f826b3857e889a1f313448b2f4eae246
+AUX dracut-009-don-t-skip-zero-length-string-outfile.patch 950 RMD160 1cd175424227556503e834cba87c94f6fc8a183b SHA1 d3a3d0574d1bc8e8fac7ef07a4b87aa72248387d SHA256 b6b9d10da95495b33b8cb9f6eac7b675fe2ffbb18d9d573ca48ba62df37915f3
+AUX dracut-009-multipath-udev-rules.patch 848 RMD160 99527326b1c5c33647a750d4bba2da9b6b5f0c92 SHA1 353c065322645f063fd3ae90ece7635eab8225ed SHA256 0e2215897b7cbac1bf9c84b42d6eb8af4438674934749bc339f768cba6662c18
 DIST dracut-002.tar.bz2 68444 RMD160 9cfd1a29c01506fe36611745cf40a36a71502435 SHA1 dd86eac785486d5aff1d8529a67e4522f5519b54 SHA256 c667fa44b76553c49a463b0c40ac8aa3bb0bd401e18016190158abe85c0d736f
 DIST dracut-003.tar.bz2 82841 RMD160 627ce019f739787a4048d5d1d461619c0b0c51e2 SHA1 2921127f01042d59f5b1d6e2697aad2b0dff0dc9 SHA256 ca1545e48143d059ea82c4de7669e11fbb20f4225a0e63a62b55f27188cbe50b
 DIST dracut-004.tar.bz2 86057 RMD160 13cd737aa2c68fb281af914541c2791de7de8366 SHA1 870f1f32a14a8f8b8ca8b15806dc4f2418fe1577 SHA256 2ce114b861965cadc004e9e7fb34b810b6b823d85521249cb87db302b63e1eea
 DIST dracut-006.tar.bz2 88986 RMD160 e477b3e7d55f450613d4d4b0e7e15816fc943ca1 SHA1 851f8c19a7624e87b2fcae15eba793d0e9b2e101 SHA256 88831d055e1139616a57d5446fecb9f3349dd0edc7c64aa024d7f5ca7e7538fc
 DIST dracut-007.tar.bz2 99629 RMD160 5bb9d1e89e3d7b3a024369eecb594e71a359778d SHA1 38f2e74f127f682eac4dc7da30ee0ea8debfff1f SHA256 6d58778bcf24b46c82cc72c7d6f5cc1e7bac7f3f9c33aa542052583bd00d20e1
 DIST dracut-008.tar.bz2 136218 RMD160 2804a92c99539c19af54f256da2ceca34cff110a SHA1 7a3d3133ee52d824f11c9b2ccfca56fb983bda81 SHA256 f0cb0e022064c5b2fe02af9906f19ad77000d5f1813fe6cd57b037aaee921d31
+DIST dracut-009.tar.bz2 143623 RMD160 bf9126fd1310f74bf78917f8ea374ded15e7359c SHA1 4b8efde1ac7e82d740873f051309b1fc946a21c4 SHA256 791b4167f78e5c553bdd4165f4753bbe54a3662d90fc7ef695dd15c5c95f68c7
 EBUILD dracut-002-r1.ebuild 2833 RMD160 8833ea7680a1a03e4ab79dc6020de39e1e70df1d SHA1 9af0c9f35f3d526b110bbddad7ab89b4480e27f6 SHA256 e6047fd603226bd9e78dc359522952ea26723dc27a5404ed5685de1925605c96
 EBUILD dracut-003.ebuild 2479 RMD160 ee169ce1f2658e6158d754cf42f171d9a810b6ba SHA1 ce465d891e920340af4f251012ce6033e9cc8002 SHA256 5663e2616f299d1f157a55106be8b859e01009d20bd64a51e18102345a244f6e
 EBUILD dracut-004.ebuild 2479 RMD160 f93fc7e4ecca21461ec1df0f78b61a33a89b3c9d SHA1 667e8d6d9d13c34f95a3b2babab96c19ccd8c18c SHA256 ed290957b745d29e5eb54a0e588c6f4c590b8ef99fb17cba6d29caab582dfa1e
@@ -30,16 +33,17 @@ EBUILD dracut-006.ebuild 2902 RMD160 93b6e82c389c9f4fe5608b22fdf9d9eb39656341 SH
 EBUILD dracut-007.ebuild 4816 RMD160 3812816e7d41a564f124a4ce6b8d171cfc5060c3 SHA1 783cf18f6c110881512332120c853f74e760ce71 SHA256 9e45d69f1ab6304c07401739b6c3e027281fd87a41d95293981772f701b7d72f
 EBUILD dracut-008-r1.ebuild 5831 RMD160 0db8d18a0387c4769e652080f955e03be6364f70 SHA1 f214b1dc8c8e80021af73ef6f06460f99084027f SHA256 063807d219e84f1ec2f3b8af0be0b1023dd11ec9c4c17d1804a8605c6135bb51
 EBUILD dracut-008.ebuild 5744 RMD160 164ad9849da18ff05acaf28b0033cd6670040378 SHA1 ff917591bbc2b8262731b21aaf616c98fa9720b0 SHA256 448f7370344e0c4327db320401c503d2376cd3ecca0184a487fa578e21b4db90
-MISC ChangeLog 4832 RMD160 182d4b26547e0cf320544ea4902808ef34adf6d0 SHA1 3fdfdad99669f0f32f08a12ce8af8b4556570b9f SHA256 51c15b21cdd0034fcadf421cf4b4594d2dd4f921bade770dd32092158ba7032a
+EBUILD dracut-009.ebuild 5922 RMD160 a75d7884dd33800c5f38ac361abca52274157ba0 SHA1 38f4723d20eac31190f0fd2181a2bf762d4fbef4 SHA256 018986a908c44f10216e12e8f9c2db1611aab95615e57c8244d8b855f9678ef5
+MISC ChangeLog 5386 RMD160 38c9078b8e13b2d1317dee5672c59c513510378d SHA1 939def788eaf2e44e431015b20de4485c1e659bd SHA256 dbf95a77b4261248c3e0b24fdb1121769662f0ce27cc6bddd30d33514e990615
 MISC metadata.xml 1820 RMD160 6e51027b7113eb28371e85618e636bf6ee1a3942 SHA1 63b26083897f28ae527b3d580f30981e60ebbf7d SHA256 cb8e1b5f04b63b4832c38fc1dd9e95501bcffa41f6f79fe6e251bfc7c702e5c3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNh0buAAoJEPATRTHh2/q1hZEH/Agjw2O184Vw2IzxOD8BDtUS
-DWemwSlBSNn1Q2zorOuNb+GJMOGl+BYCxaOVVuOcwtPZ/X/tuUdNz/Pus7qaarSy
-xSgVSG+1A6H0Kx2Xx2Nt2+YxvfimLzjTSwQiNmZ39t/3Ny3SIiO0m1A61WWCJ1Rd
-i3IXql9nPIeyYpiAisgL+X5gsEj9NykWTHe5XXuWkmg69njm8tOqvGC+H8XIqFwT
-DsouHC88pB3S2vXIfEdeMudvAaVcDH6+QBCgK4+YlnDhjkGqSpTRsgHS0TkeGRwC
-9bfTBkaMHOJu2yohpDRLwFk1/LUCk5MByjzOjbUINQu+QShIbxxr8LVMrQV43lU=
-=REt/
+iQEcBAEBAgAGBQJNkRvrAAoJEPATRTHh2/q1MUYH/A+iSvH6QjD/9dA19V/gfl/U
+vjaFdiZ0PrQUkhe9qmOKB4EToPw9r6A7cCJKLmyrAjekZpUpypv1ji84ciyjWKaP
+UTMNW1Zdlng7ipjdit4T0du35QVtsK1Az2oxcBllvezPSB+AB/zQ4xrVxUU9YJ6X
+DWQa8z0dtK1dcxEwqrstITW1RltRAjb7IplWfOiHj6T0UIVm2xzTqdX9qBQsntpz
++kKhoxpMeUG009zT2j+2D/HAWmfGym1JqcZTjmbOw9lunob6HMVb1DZ9ok94wTbM
+z62g3nd40bcrw2koN5jcm5PGLngTNmmu3/LLsmweP0InPrZzIPdKjUJgdBD+P+8=
+=elue
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/dracut/dracut-009.ebuild b/sys-kernel/dracut/dracut-009.ebuild
new file mode 100644
index 000000000000..3bbc60ee1c6f
--- /dev/null
+++ b/sys-kernel/dracut/dracut-009.ebuild
@@ -0,0 +1,212 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-009.ebuild,v 1.1 2011/03/28 23:38:14 aidecoe Exp $
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="Generic initramfs generation tool"
+HOMEPAGE="http://dracut.wiki.kernel.org"
+SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+COMMON_MODULES="
+	dracut_modules_biosdevname
+	dracut_modules_btrfs
+	dracut_modules_caps
+	dracut_modules_gensplash
+	dracut_modules_mdraid
+	dracut_modules_multipath
+	dracut_modules_plymouth
+	dracut_modules_syslog
+	dracut_modules_xen
+	"
+NETWORK_MODULES="
+	dracut_modules_iscsi
+	dracut_modules_nbd
+	dracut_modules_nfs
+	"
+DM_MODULES="
+	dracut_modules_crypt
+	dracut_modules_dmraid
+	dracut_modules_dmsquash-live
+	dracut_modules_lvm
+	"
+IUSE_DRACUT_MODULES="${COMMON_MODULES} ${DM_MODULES} ${NETWORK_MODULES}"
+IUSE="debug selinux ${IUSE_DRACUT_MODULES}"
+
+NETWORK_DEPS="net-misc/bridge-utils >=net-misc/dhcp-4.2.1-r1 sys-apps/iproute2"
+DM_DEPS="|| ( sys-fs/device-mapper >=sys-fs/lvm2-2.02.33 )"
+
+RDEPEND="
+	>=app-shells/bash-4.0
+	>=app-shells/dash-0.5.4.11
+	>=sys-apps/baselayout-1.12.14-r1
+	>=sys-apps/module-init-tools-3.5
+	>=sys-apps/sysvinit-2.87-r3
+	>=sys-apps/util-linux-2.16
+	>=sys-fs/udev-149
+
+	debug? ( dev-util/strace )
+	selinux? ( sys-libs/libselinux sys-libs/libsepol )
+	dracut_modules_biosdevname? ( sys-apps/biosdevname )
+	dracut_modules_btrfs? ( sys-fs/btrfs-progs )
+	dracut_modules_caps? ( sys-libs/libcap )
+	dracut_modules_crypt? ( sys-fs/cryptsetup ${DM_DEPS} )
+	dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools ${DM_DEPS} )
+	dracut_modules_dmsquash-live? ( sys-apps/eject ${DM_DEPS} )
+	dracut_modules_gensplash? ( media-gfx/splashutils )
+	dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 ${NETWORK_DEPS} )
+	dracut_modules_lvm? ( >=sys-fs/lvm2-2.02.33 )
+	dracut_modules_mdraid? ( sys-fs/mdadm )
+	dracut_modules_multipath? ( sys-fs/multipath-tools )
+	dracut_modules_nbd? ( sys-block/nbd ${NETWORK_DEPS} )
+	dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind ${NETWORK_DEPS} )
+	dracut_modules_plymouth? ( >=sys-boot/plymouth-0.8.3-r1 )
+	dracut_modules_syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) )
+	dracut_modules_xen? ( app-emulation/xen )
+	"
+DEPEND="
+	>=dev-libs/libxslt-1.1.26
+	app-text/docbook-xml-dtd:4.5
+	>=app-text/docbook-xsl-stylesheets-1.75.2
+	"
+
+#
+# Helper functions
+#
+
+# Returns true if any of specified modules is enabled by USE flag and false
+# otherwise.
+# $1 = list of modules (which have corresponding USE flags of the same name)
+any_module() {
+	local m modules=" $@ "
+
+	for m in ${modules}; do
+		! use $m && modules=${modules/ $m / }
+	done
+
+	shopt -s extglob
+	modules=${modules%%+( )}
+	shopt -u extglob
+
+	[[ ${modules} ]]
+}
+
+# Removes module from modules.d.
+# $1 = module name
+# Module name can be specified without number prefix.
+rm_module() {
+	local m
+
+	for m in $@; do
+		if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then
+			rm -rf "${modules_dir}"/$m
+		else
+			rm -rf "${modules_dir}"/[0-9][0-9]$m
+		fi
+	done
+}
+
+# Displays Gentoo Base System major release number
+base_sys_maj_ver() {
+	local line
+
+	read line < /etc/gentoo-release
+	line=${line##* }
+	echo "${line%%.*}"
+}
+
+#
+# ebuild functions
+#
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-multipath-udev-rules.patch"
+	epatch "${FILESDIR}/${P}-don-t-skip-zero-length-string-outfile.patch"
+}
+
+src_compile() {
+	emake WITH_SWITCH_ROOT=0 || die "emake failed"
+}
+
+src_install() {
+	emake WITH_SWITCH_ROOT=0 \
+		prefix=/usr sysconfdir=/etc DESTDIR="${D}" \
+		install || die "emake install failed"
+
+	local gen2conf
+
+	dodir /var/lib/dracut/overlay
+	dodoc HACKING TODO AUTHORS NEWS README* || die 'dodoc failed'
+
+	case "$(base_sys_maj_ver)" in
+		1) gen2conf=gentoo.conf ;;
+		2) gen2conf=gentoo-openrc.conf ;;
+		*) die "Expected ver. 1 or 2 of Gentoo Base System (/etc/gentoo-release)."
+	esac
+
+	insinto /etc/dracut.conf.d
+	newins dracut.conf.d/${gen2conf}.example ${gen2conf} \
+		|| die 'gen2conf ins failed'
+
+	insinto /etc/logrotate.d
+	newins dracut.logrotate dracut || die 'dracut.logrotate ins failed'
+
+	#
+	# Modules
+	#
+	local module
+	modules_dir="${D}/usr/share/dracut/modules.d"
+
+	echo "${PF}" > "${modules_dir}"/10rpmversion/dracut-version \
+		|| die 'dracut-version failed'
+
+	# Remove modules not enabled by USE flags
+	for module in ${IUSE_DRACUT_MODULES} ; do
+		! use ${module} && rm_module ${module#dracut_modules_}
+	done
+
+	# Those flags are specific, and even are corresponding to modules, they need
+	# to be declared as regular USE flags.
+	use debug || rm_module 95debug
+	use selinux || rm_module 98selinux
+
+	! any_module ${DM_MODULES} && rm_module 90dm
+	! any_module ${NETWORK_MODULES} && rm_module 45ifcfg 40network
+
+	# Remove S/390 modules which are not tested at all
+	rm_module 95dasd 95dasd_mod 95zfcp 95znet
+
+	# Remove modules which won't work for sure
+	rm_module 00bootchart 05busybox # broken
+	rm_module 95fcoe 97biosdevname # no tools
+
+	# fips module depends on masked app-crypt/hmaccalc
+	rm_module 01fips
+}
+
+pkg_postinst() {
+	elog 'To generate the initramfs:'
+	elog '    # mount /boot (if necessary)'
+	elog '    # dracut "" <kernel-version>'
+	elog ''
+	elog 'For command line documentation see dracut.kernel(7).'
+	elog ''
+	elog 'Simple example to select root and resume partition:'
+	elog '    root=/dev/sda1 resume=/dev/sda2'
+	elog ''
+	elog 'The default config (in /etc/dracut.conf) is very minimal and is highly'
+	elog 'recommended you adjust based on your needs. To include only dracut'
+	elog 'modules and kernel drivers for this system, use the "-H" option.'
+	elog 'Some modules need to be explicitly added with "-a" option even if'
+	elog 'required tools are installed.'
+	echo
+	elog 'Options (documented in dracut.kernel(7)) have new format since'
+	elog 'version 008. Old format is preserved, but will be removed in future.'
+	elog 'Please migrate to the new one.'
+}
diff --git a/sys-kernel/dracut/files/dracut-009-don-t-skip-zero-length-string-outfile.patch b/sys-kernel/dracut/files/dracut-009-don-t-skip-zero-length-string-outfile.patch
new file mode 100644
index 000000000000..4deeb6b983a8
--- /dev/null
+++ b/sys-kernel/dracut/files/dracut-009-don-t-skip-zero-length-string-outfile.patch
@@ -0,0 +1,32 @@
+From fcc34c5611c2a5298380c9d47e5d7883a7a6f422 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
+Date: Tue, 29 Mar 2011 00:46:31 +0200
+Subject: [PATCHv2] dracut: don't skip zero-length string outfile argument
+
+When '' was passed as outfile, dracut generated name with following
+pattern:
+
+  /boot/initramfs-$kernel
+
+With commit 486a1b9324d6fc7bc534d8147d64b8b259692c46 dracut skips ''
+argument.
+---
+ dracut |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/dracut b/dracut
+index 6b67dc0..c16b222 100755
+--- a/dracut
++++ b/dracut
+@@ -237,7 +237,7 @@ while (($# > 0)); do
+                        ;;
+         -*) printf "\nUnknown option: %s\n\n" "$1" >&2; usage; exit 1;;
+         *) 
+-            if ! [[ $outfile ]]; then
++            if ! [[ ${outfile+x} ]]; then
+                 outfile=$1
+             elif [[ $kernel = "unset" ]]; then
+                 kernel=$1
+-- 
+1.7.4.1
+
diff --git a/sys-kernel/dracut/files/dracut-009-multipath-udev-rules.patch b/sys-kernel/dracut/files/dracut-009-multipath-udev-rules.patch
new file mode 100644
index 000000000000..2b9cffad38c4
--- /dev/null
+++ b/sys-kernel/dracut/files/dracut-009-multipath-udev-rules.patch
@@ -0,0 +1,24 @@
+From 7f3e0c13f1c10e93c3823b6367f9ac83865f3d90 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
+Date: Fri, 25 Feb 2011 01:44:25 +0100
+Subject: [PATCH] 90multipath: added kpartx.rules; multipath.rules - different prefix
+
+---
+ modules.d/90multipath/module-setup.sh |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh
+index f78517c..3f4f612 100755
+--- a/modules.d/90multipath/module-setup.sh
++++ b/modules.d/90multipath/module-setup.sh
+@@ -58,6 +58,6 @@ install() {
+ 
+     inst_hook pre-trigger 02 "$moddir/multipathd.sh"
+     inst_hook pre-pivot   02 "$moddir/multipathd-stop.sh"
+-    inst_rules 40-multipath.rules
++    inst_rules 40-multipath.rules 65-multipath.rules 66-kpartx.rules
+ }
+ 
+-- 
+1.7.4.1
+