sys-kernel/dracut: Version bump to 008, resolves bug #353577

(Portage version: 2.1.9.41/cvs/Linux x86_64)

6 files changed, 349 insertions, 1 deletions

diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog
index 3bd91d223c44..0056a8d77562 100644
--- a/sys-kernel/dracut/ChangeLog
+++ b/sys-kernel/dracut/ChangeLog
@@ -1,6 +1,31 @@
 # 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.8 2011/01/09 03:27:27 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.9 2011/03/01 01:59:53 aidecoe Exp $
+
+*dracut-008 (01 Mar 2011)
+
+  01 Mar 2011; Amadeusz Żołnowski <aidecoe@gentoo.org> +dracut-008.ebuild,
+  +files/dracut-008-dm-udev-rules.patch,
+  +files/dracut-008-i18n-config-file-parsing-in-hostonly.patch,
+  +files/dracut-008-multipath-udev-rules.patch:
+  Version bump, resolves bug #353577
+
+  Changes:
+  - modules controlled by DRACUT_MODULES USE_EXPAND instead of regular IUSE
+    (except of 'debug' and 'selinux')
+  - removed mount-boot and mkdir of /boot/dracut (user can create it
+    him/herself if really needed)
+  - added dependency on baselayout-1.12.14-r1 or above
+  - few minor fixes in the ebuild like missing 'die' and so
+
+  Other notes:
+  - removing biosdevname module (there's no package yet)
+  - removing broken modules: bootchart and busybox
+
+  Thanks to
+    Lucian Muresan <lucianm@users.sourceforge.net>
+    and Xake <xake@rymdraket.net>
+  for report and comments.
 
   09 Jan 2011; Mike Frysinger <vapier@gentoo.org> dracut-007.ebuild:
   Use new mount-boot_pkg_postinst helper.
diff --git a/sys-kernel/dracut/dracut-008.ebuild b/sys-kernel/dracut/dracut-008.ebuild
new file mode 100644
index 000000000000..cb5da433b168
--- /dev/null
+++ b/sys-kernel/dracut/dracut-008.ebuild
@@ -0,0 +1,203 @@
+# 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-008.ebuild,v 1.1 2011/03/01 01:59:53 aidecoe Exp $
+
+EAPI=2
+
+inherit eutils
+
+DESCRIPTION="Generic initramfs generation tool"
+HOMEPAGE="http://sourceforge.net/projects/dracut/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~amd64"
+
+COMMON_MODULES="
+	dracut_modules_btrfs
+	dracut_modules_gensplash
+	dracut_modules_mdraid
+	dracut_modules_multipath
+	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-3.1.2_p1 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_btrfs? ( sys-fs/btrfs-progs )
+	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[utils] ${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_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}-dm-udev-rules.patch"
+	epatch "${FILESDIR}/${P}-i18n-config-file-parsing-in-hostonly.patch"
+	epatch "${FILESDIR}/${P}-multipath-udev-rules.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'
+
+	#
+	# 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 man 7 dracut.kernel.'
+	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
+	ewarn 'dhcp-3 is known to not work with QEMU. You will need dhcp-4 or'
+	ewarn 'later for it.'
+}
diff --git a/sys-kernel/dracut/files/dracut-008-dm-udev-rules.patch b/sys-kernel/dracut/files/dracut-008-dm-udev-rules.patch
new file mode 100644
index 000000000000..1ca778abdd5b
--- /dev/null
+++ b/sys-kernel/dracut/files/dracut-008-dm-udev-rules.patch
@@ -0,0 +1,62 @@
+From 08b94155141151123737ff72a8cdd9c818de2e68 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
+Date: Sat, 26 Feb 2011 08:08:37 +0100
+Subject: [PATCH 2/2] Gentoo ebuild for LVM2 prior to 2.02.63-r1 doesn't install rules:
+
+  10-dm.rules
+  11-dm-lvm.rules
+  13-dm-disk.rules
+  95-dm-notify.rules
+
+but provides only 64-device-mapper.rules combining more or less the
+above rules files.
+---
+ modules.d/90dm/module-setup.sh     |    3 +++
+ modules.d/90dmraid/module-setup.sh |    3 +++
+ modules.d/90lvm/module-setup.sh    |    3 +++
+ 3 files changed, 9 insertions(+), 0 deletions(-)
+
+diff --git a/modules.d/90dm/module-setup.sh b/modules.d/90dm/module-setup.sh
+index 11985fd..67b4d40 100755
+--- a/modules.d/90dm/module-setup.sh
++++ b/modules.d/90dm/module-setup.sh
+@@ -22,5 +22,8 @@ install() {
+ 
+     type -P dmeventd >/dev/null && dracut_install dmeventd
+     inst_rules 10-dm.rules 95-dm-notify.rules
++    # Gentoo ebuild for LVM2 prior to 2.02.63-r1 doesn't install above rules
++    # files, but provides the one below:
++    inst_rules 64-device-mapper.rules
+ }
+ 
+diff --git a/modules.d/90dmraid/module-setup.sh b/modules.d/90dmraid/module-setup.sh
+index f437712..6950d3c 100755
+--- a/modules.d/90dmraid/module-setup.sh
++++ b/modules.d/90dmraid/module-setup.sh
+@@ -43,6 +43,9 @@ install() {
+     done
+ 
+     inst_rules 10-dm.rules 13-dm-disk.rules 95-dm-notify.rules 
++    # Gentoo ebuild for LVM2 prior to 2.02.63-r1 doesn't install above rules
++    # files, but provides the one below:
++    inst_rules 64-device-mapper.rules
+ 
+     inst "$moddir/dmraid.sh" /sbin/dmraid_scan
+ 
+diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh
+index 2555728..f3da242 100755
+--- a/modules.d/90lvm/module-setup.sh
++++ b/modules.d/90lvm/module-setup.sh
+@@ -47,6 +47,9 @@ install() {
+     fi
+ 
+     inst_rules 10-dm.rules 13-dm-disk.rules 95-dm-notify.rules 11-dm-lvm.rules
++    # Gentoo ebuild for LVM2 prior to 2.02.63-r1 doesn't install above rules
++    # files, but provides the one below:
++    inst_rules 64-device-mapper.rules
+ 
+     inst "$moddir/lvm_scan.sh" /sbin/lvm_scan
+     inst_hook cmdline 30 "$moddir/parse-lvm.sh"
+-- 
+1.7.4.1
+
diff --git a/sys-kernel/dracut/files/dracut-008-i18n-config-file-parsing-in-hostonly.patch b/sys-kernel/dracut/files/dracut-008-i18n-config-file-parsing-in-hostonly.patch
new file mode 100644
index 000000000000..01de912de1d6
--- /dev/null
+++ b/sys-kernel/dracut/files/dracut-008-i18n-config-file-parsing-in-hostonly.patch
@@ -0,0 +1,30 @@
+From ebaed7d51f61d331d128037e0b37130c58e957e3 Mon Sep 17 00:00:00 2001
+From: Harald Hoyer <harald@redhat.com>
+Date: Fri, 18 Feb 2011 09:33:06 +0100
+Subject: [PATCH 07/22] i18n: fixed config file parsing in hostonly mode
+
+I accidently removed some parenthesis.
+---
+ modules.d/10i18n/module-setup.sh |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/modules.d/10i18n/module-setup.sh b/modules.d/10i18n/module-setup.sh
+index a524d2d..57a0f9a 100755
+--- a/modules.d/10i18n/module-setup.sh
++++ b/modules.d/10i18n/module-setup.sh
+@@ -68,10 +68,10 @@ install() {
+ 
+         for item in $@
+         do
+-            item=${item/:/ }
++            item=(${item/:/ })
+             for map in ${item[1]//,/ }
+             do
+-                map=${map//-/ }
++                map=(${map//-/ })
+                 value=$(grep "^${map[0]}=" "${item[0]}")
+                 value=${value#*=}
+                 echo "${map[1]:-${map[0]}}=${value}"
+-- 
+1.7.4.1
+
diff --git a/sys-kernel/dracut/files/dracut-008-multipath-udev-rules.patch b/sys-kernel/dracut/files/dracut-008-multipath-udev-rules.patch
new file mode 100644
index 000000000000..cce21ae2c32a
--- /dev/null
+++ b/sys-kernel/dracut/files/dracut-008-multipath-udev-rules.patch
@@ -0,0 +1,24 @@
+From b9ffb4f62109670c84de6ab4ccf53c8f25c20ca3 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 1/2] 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
+
diff --git a/sys-kernel/dracut/metadata.xml b/sys-kernel/dracut/metadata.xml
index 5f8c052cc055..c2ccb84de972 100644
--- a/sys-kernel/dracut/metadata.xml
+++ b/sys-kernel/dracut/metadata.xml
@@ -6,6 +6,10 @@
 		<email>ramereth@gentoo.org</email>
 		<name>Lance Albertson</name>
 	</maintainer>
+	<maintainer>
+		<email>aidecoe@gentoo.org</email>
+		<name>Amadeusz Żołnowski</name>
+	</maintainer>
 	<use>
         <flag name="bootchart">Add support for bootchart (app-benchmarks/bootchart)</flag>
         <flag name="btrfs">Add support for root on Btrfs</flag>