sys-kernel/dracut: Rev-bump to 010-r1. Fixes #361603.

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

4 files changed, 256 insertions, 9 deletions

diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog
index 48fe29f5be00..4e8796527e92 100644
--- a/sys-kernel/dracut/ChangeLog
+++ b/sys-kernel/dracut/ChangeLog
@@ -1,6 +1,12 @@
 # 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.21 2011/04/01 14:59:53 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.22 2011/04/01 22:54:36 aidecoe Exp $
+
+*dracut-010-r1 (01 Apr 2011)
+
+  01 Apr 2011; Amadeusz Żołnowski <aidecoe@gentoo.org> +dracut-010-r1.ebuild,
+  +files/dracut-010-empty-etc-ld.so.conf.d.patch:
+  Rev-bump. Fixes #361603.
 
 *dracut-010 (01 Apr 2011)
 
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 9f908a78a65b..c6f56624c139 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -8,6 +8,7 @@ AUX dracut-008-i18n-config-file-parsing-in-hostonly.patch 966 RMD160 3d37f7f3009
 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
+AUX dracut-010-empty-etc-ld.so.conf.d.patch 775 RMD160 0e8463dd1fabdfabab26861c495b769fe107714f SHA1 a35bacc2df3fd02dae30d9f397eb40c60dbc94ac SHA256 29fda5b71ae76d734b4ea5817e6601c221c15792514be2ad550413cb94725d1b
 AUX dracut-010-multipath-udev-rules.patch 848 RMD160 99527326b1c5c33647a750d4bba2da9b6b5f0c92 SHA1 353c065322645f063fd3ae90ece7635eab8225ed SHA256 0e2215897b7cbac1bf9c84b42d6eb8af4438674934749bc339f768cba6662c18
 DIST dracut-007.tar.bz2 99629 RMD160 5bb9d1e89e3d7b3a024369eecb594e71a359778d SHA1 38f2e74f127f682eac4dc7da30ee0ea8debfff1f SHA256 6d58778bcf24b46c82cc72c7d6f5cc1e7bac7f3f9c33aa542052583bd00d20e1
 DIST dracut-008.tar.bz2 136218 RMD160 2804a92c99539c19af54f256da2ceca34cff110a SHA1 7a3d3133ee52d824f11c9b2ccfca56fb983bda81 SHA256 f0cb0e022064c5b2fe02af9906f19ad77000d5f1813fe6cd57b037aaee921d31
@@ -17,17 +18,18 @@ EBUILD dracut-007.ebuild 4817 RMD160 b9d983b8cdabc60e0cadf90f1405c76e88731cf8 SH
 EBUILD dracut-008-r1.ebuild 5832 RMD160 5a5f978f28be2cdef5f6df5782d623b25a417123 SHA1 6ec710509d56427941e00cf0bff6edf16d892f2a SHA256 95c03df493e91c716de5573a9a33134dd6a660a31ddbf8f9dbd7317b1d979ddc
 EBUILD dracut-008.ebuild 5745 RMD160 194d7b14c84d8411d49235a4359d6d2c6193cce6 SHA1 5346f7e5be40e78d57ec0dc2e0dcb326172a11ab SHA256 bd308a8caddf8737455439383931dd7275384e8814599a63c9eb76a0a165aa5f
 EBUILD dracut-009-r1.ebuild 5912 RMD160 6d0ca0bb0989d42700ecec4b2fea91be914861ff SHA1 121a9ea5bc03967b149b734db9de945c6213ca1c SHA256 620196708d1c6df83de5a433354c3c34062e031f9d06dba56887441b40b800a4
+EBUILD dracut-010-r1.ebuild 5896 RMD160 f461ac47d01de6aa9069e68cff32bfb3c515fdbd SHA1 dbb4eb373ccdccd8c9bcfe83cdde116e426e80bd SHA256 a5e18cba1a9d42e1e84b800933ae02e2337293225898d6cc1165521a82be8a2c
 EBUILD dracut-010.ebuild 5837 RMD160 0df9dcc9b017147358ec343a8b07cd0b37246a6f SHA1 a6b652811c1b934b77a9794d1958439b1fab4069 SHA256 8350ce428a0d97f983eb138f543917eb4776a220e0ab6c8ccb1f91d879b4197e
-MISC ChangeLog 6760 RMD160 e50d22491c1938d3560ff964edd5a876863aafa6 SHA1 19d86224ff02a6498a43a07bcd23661de0ed2cd7 SHA256 8f4908d4a18d6010479d7630ea967a71373b9c4712d2db8ced277969a425c351
+MISC ChangeLog 6948 RMD160 aeb96c7db16a9e4f9c0dc3f155eee85d23897d3d SHA1 735fba03de3c075eabbdcab1fd7f79167e14645d SHA256 df0cb7d95304b40b038d29cec5ebc43c59eb966302db15b7f1c07e7e5fb238e3
 MISC metadata.xml 1725 RMD160 39ad0c0c425b5422045655565f4fb4ac0b466ae8 SHA1 cf1a5835711f3cf7b5b25a49dc046d9493f1c6ea SHA256 572c681c3a7996183b74fe19a6da477dccc4184c6f0d0e7c0608f6909611048a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJNlehvAAoJEPATRTHh2/q1WmsH/AsqI4PUl10W9jBeYoopclE+
-bqlbxVcwcwZ2CC/nJyZDAmx0KVLDje9wDEpuBUHXnVCycXSxkxjY2g5ENNOOVMN5
-uQQewPwo//JQL149K6t34Sdwoaxv3MsIWp2CBU+bxW61tfGDbi2FLUDIyb0EGXXr
-SE/f91D6tJF5hYRlobVOWTRpT9dRzPVUOs90CALQsbC1Tpf7SC5pqFD+yvphIM1F
-QV176NOI6yOk/mjvipwRJS8CRUzrp+/1LkJZiOerhev5DXl9OkgH2uKelsh4lWOE
-ellM40lLk/3ykZbaaEsgTVFLbvGpKIQ4Oh76lrWxPBJzVNsSZf8nb7jQbOCCBPE=
-=dUQd
+iQEcBAEBAgAGBQJNlleyAAoJEPATRTHh2/q1LnwIAJeWeC5bV8nBfiVpYRI/rLhn
+E8SKwNY71LJo1ymalBfW76wyq20RMqj10gdLIyVWHBEfFmhhVpEg6hF82Cj1dGqS
+BZGeyorFTYmKl5pitggo8OJNHEkL/4nOfAmv7Tewt6bcwmQ53CPbBMHRl6rHCtIT
+yTdUwKkD2tKwgki6wQ5/Z4llnskquHMkAeD54bdk1/2Pd90sdGSZOfet3hO3pJli
+uLVMDdYhwB7TggHOoS9WmclDi2yMGtshpRapfWcmCATAvO0uW1ma32vXeLP7w2Du
+9PG+MUf1lU1qTpyuMJjuobBAwaUtJ1SDtv59Kigr9ThPD0E4iqmY6XnMOfP8WIs=
+=FEkI
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/dracut/dracut-010-r1.ebuild b/sys-kernel/dracut/dracut-010-r1.ebuild
new file mode 100644
index 000000000000..92acf6c2c6ea
--- /dev/null
+++ b/sys-kernel/dracut/dracut-010-r1.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-010-r1.ebuild,v 1.1 2011/04/01 22:54:36 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}-empty-etc-ld.so.conf.d.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 # 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-010-empty-etc-ld.so.conf.d.patch b/sys-kernel/dracut/files/dracut-010-empty-etc-ld.so.conf.d.patch
new file mode 100644
index 000000000000..e3cfc1227f47
--- /dev/null
+++ b/sys-kernel/dracut/files/dracut-010-empty-etc-ld.so.conf.d.patch
@@ -0,0 +1,27 @@
+From 9aa83aa66ab6d31f30ed4d25a39b1ece067e0453 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
+Date: Sat, 2 Apr 2011 00:39:38 +0200
+Subject: [PATCH] dracut: don't fail on empty /etc/ld.so.conf.d/
+
+---
+ dracut |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/dracut b/dracut
+index c6605bb..15a5ee5 100755
+--- a/dracut
++++ b/dracut
+@@ -524,7 +524,9 @@ done
+ unset item
+ 
+ # make sure that library links are correct and up to date
+-dracut_install /etc/ld.so.conf /etc/ld.so.conf.d/*
++for f in /etc/ld.so.conf /etc/ld.so.conf.d/*; do
++    [[ -e $f ]] && dracut_install "$f"
++done
+ if ! ldconfig -r "$initdir"; then
+     if [[ $UID = 0 ]]; then
+         derror "ldconfig exited ungracefully"
+-- 
+1.7.4.1
+