sys-kernel/dracut: Version bump to 016. 015 is skipped.

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

4 files changed, 322 insertions, 9 deletions

diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog
index 8042021d76dd..4ef73a0a958f 100644
--- a/sys-kernel/dracut/ChangeLog
+++ b/sys-kernel/dracut/ChangeLog
@@ -1,6 +1,52 @@
 # ChangeLog for sys-kernel/dracut
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.43 2012/01/30 18:03:13 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.44 2012/02/15 18:38:30 aidecoe Exp $
+
+*dracut-016 (15 Feb 2012)
+
+  15 Feb 2012; Amadeusz Żołnowski <aidecoe@gentoo.org> +dracut-016.ebuild,
+  +files/dracut-016-multipath-udev-rules.patch:
+  Version bump.
+
+  New modules come:
+  - convertfs
+  - ssh-client
+  - terminfo
+
+  Kernel options are checked starting with this ebuild. CONFIG_BLK_DEV_INITRD
+  is obvious and was always required and since dracut 015 CONFIG_DEVTMPFS is
+  required, too.
+
+  usrmount module doesn't enforce /usr being mount ro anymore.
+
+  NEWS
+  ~~~~
+  Extracted from Dracut NEWS file - merged news from version 015 and 016,
+  because 015 was skipped in Portage:
+
+  - fixed lsinitrd
+  - honor binaries in sbin first
+  - fixed usrmount module
+  - added systemd service for shutdown
+  - fixed terminfo on distros with /usr/share/terminfo
+  - reload udev rules after "pre-trigger" hook
+  - improved test suite
+  - new parameter "--omit-drivers" and new conf param omit_drivers
+  - "--offroot" support for mdraid
+  - new libs: net-lib.sh, nfs-lib.sh, url-lib.sh, img-lib.sh
+  full of functions to use in your dracut module
+  - hostonly mode automatically adds command line options for root and /usr
+  - --add-fstab --mount parameters
+  - ssh-client module
+  - --ctty option: add job control
+  - cleanup /run/initramfs
+  - convertfs module
+  - /sbin/ifup can be called directly
+  - support kernel modules compressed with xz
+  - s390 iscsi modules added
+  - terminfo module
+  - lsinitrd can handle concatened images
+  - lsinitrd can sort by size
 
 *dracut-014-r2 (30 Jan 2012)
 
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 26f1a0f99189..4269ff563fa4 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -11,22 +11,25 @@ AUX dracut-013-makefile-manpages.patch 1351 RMD160 09f3fe7b488b3ff5aaa11f7c8a671
 AUX dracut-013-multipath-udev-rules.patch 848 RMD160 99527326b1c5c33647a750d4bba2da9b6b5f0c92 SHA1 353c065322645f063fd3ae90ece7635eab8225ed SHA256 0e2215897b7cbac1bf9c84b42d6eb8af4438674934749bc339f768cba6662c18
 AUX dracut-014-multipath-udev-rules.patch 848 RMD160 99527326b1c5c33647a750d4bba2da9b6b5f0c92 SHA1 353c065322645f063fd3ae90ece7635eab8225ed SHA256 0e2215897b7cbac1bf9c84b42d6eb8af4438674934749bc339f768cba6662c18
 AUX dracut-014-usrmount-fsck-fix.patch 1208 RMD160 0247c724be5e130e23d89cdfc387612de5fee3f4 SHA1 65d74c80b2ed702a6cf073f0eff819bd6df022b9 SHA256 192ed24457c07d282cbdc75576d6bfc272572c482d28188c34a48c613a5b1565
+AUX dracut-016-multipath-udev-rules.patch 848 RMD160 99527326b1c5c33647a750d4bba2da9b6b5f0c92 SHA1 353c065322645f063fd3ae90ece7635eab8225ed SHA256 0e2215897b7cbac1bf9c84b42d6eb8af4438674934749bc339f768cba6662c18
 DIST dracut-010.tar.bz2 143576 RMD160 3b98e86fdc3a3b14c257b317852d6582de06a5c6 SHA1 cd78c8a2b2629931aaf99c5fc4ef33424d84fa1c SHA256 08df4fee439bc96f9f58fcd9ac1445cf5954fe5066643449e0d6a846d0a23ba7
 DIST dracut-013.tar.bz2 149337 RMD160 0d0eb8a84ea0cd208afe433f28e49bfb0b423209 SHA1 1e1c7fd6f7919399fb20f25f662d0529b61f4078 SHA256 5e63cd711f28e13088a095186095e1af2561be422d1e5d0e4ab351205010c717
 DIST dracut-014.tar.bz2 155914 RMD160 bc20154b11f2924fe971f3fecb13ce18630adac5 SHA1 8a041beb9d1ca2b8fcc94c7619fd6b6093f02577 SHA256 1b81a71d121fa4e268bab098daadabb3077ecde7573b5726fe35591347fdd2e3
+DIST dracut-016.tar.bz2 164830 RMD160 092f9e91316702778b29f0c509071a5c10889ec7 SHA1 82960502a2b32408e18485b1567fb9bc2eed8572 SHA256 c195c3df9c4653108435906f9badddddee7fc21fee6c00b1e43da8a6ca8ebb4f
 EBUILD dracut-010-r3.ebuild 6065 RMD160 a22dc9a5262b0f8e5e0464f6ae7ac7e9e0569f0d SHA1 94dc7e9fde02a332a22d605e142f73336ac3a1c3 SHA256 c905f82f3ce5097abcbc240a2cdc92d0306c8750cc0102c2bcfea464d250b57b
 EBUILD dracut-013-r2.ebuild 6339 RMD160 f9ae556336ca0407ca344b176ac7477728745001 SHA1 eb1f9038db1cdf2008068e2cb7a666007b2e0fd7 SHA256 46cbfa17207fb98ad6aa55f0b71dca13c6b907a6668bfe83afa69bae1d2bac30
 EBUILD dracut-014-r2.ebuild 6178 RMD160 17c148f97be15cc737808852bd510dfaad64a687 SHA1 82629b82239d833b54690c8c0a38d8f7128d0e1c SHA256 5753ba09e1a1f13339e228050377eb85dac7153a21f725d75b39a992e3e5fdf1
-MISC ChangeLog 13622 RMD160 d99ea7fd25cc79e4e349275e979d8c8e076d4a1b SHA1 d1059cca696a1e8bbb8074f11779c57f5bf00c0d SHA256 706ddb8a041a11681f655dce202324e101d520cedb65c37153d43c77d2556514
+EBUILD dracut-016.ebuild 6485 RMD160 82aa4a0631de8037513eddec61459d705baa3d23 SHA1 41e9e91a4fed82c0f36007d572979e4f7d05f703 SHA256 b3da07d5ff014743255d662111959ef7c12db2550da446176283e5d644131bb2
+MISC ChangeLog 15095 RMD160 d3ba52163fe0488314ac9f94f876ba3cd78a9556 SHA1 0174a8c479f1dc6b2b7934bc85e5ce6690b9fae3 SHA256 3818622c7f6071cf05771fd2269d1382ea9bc1a4f53f86c9de1bef87c3495d06
 MISC metadata.xml 602 RMD160 cd11704bfcf7aca599c2671b91416112fdb2cc75 SHA1 d2345b2bb4d17a6887754a7569d7d91f32f42df2 SHA256 c234e9242c61200d81fe2ba3b58deaab911bc36413d657a61580ca6de69f2412
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPJttnAAoJEPATRTHh2/q1WC8H/ix/399e+J56TjCqf9zY1zqs
-iHerALgebopwOyQV1cqJ6sajb+nzxO94TczyYYSom/P6AQumCwUjlHhxz+oSjeZB
-7nn7Y+i8YisZA0KF/YWml4kzRXcDY1NkUtudyOpoY7Ghb67+YHAjZIEB2z2Hn7jA
-VqAUFT0MFtYcrnfhqNVq8ngGY+LuGSyoaxbNb/2+Krvs1nIeUezDGWYXxxvB8WU0
-EjbQYd+Hyt+NbEh9bJnpFHPX54vEJwmqGZx4DKulxEBZP6CoGWQoEv5lwfL1UYsI
-zRIV2IzJ1V4LNDWOf/cavLfWrgrP297UyduShWRAjIBUTdblgKZxk6CvuhfbxrQ=
-=RSVt
+iQEcBAEBAgAGBQJPO/usAAoJEPATRTHh2/q1ZZUH+gNzV/PSNthQNb+tzGczkEJR
+CWAhNrG8rm0fzLyRulcQaWkWxs+RxRWKhRj7B3SnnlrORLgmuUjIqd+fnhGP/7Uj
+uk7UphDK5dM8Dd0xLQChDztdlTOD/knKZQs86ZjcLE1X1n5Q6rMmeOXFHlron9R/
+mG5ymxqxYMyarXbxd1OofU/zKODXTr/47ktmySBwU7hYWWO9/J7C7nwu7z2fFfMm
+symTAq/Bzp4OCkry/06zExerTlVxizC7HO9KPexao+WsameM3lrS8kWzC4Pw/L+D
+8wclTGkUJzDEN6Ftg3fbZEpDKQLZMcIwxQE3E4qVt1w3J22+3V0a0bzdas7Z/n0=
+=DgU2
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/dracut/dracut-016.ebuild b/sys-kernel/dracut/dracut-016.ebuild
new file mode 100644
index 000000000000..a7717d1fb171
--- /dev/null
+++ b/sys-kernel/dracut/dracut-016.ebuild
@@ -0,0 +1,240 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-016.ebuild,v 1.1 2012/02/15 18:38:30 aidecoe Exp $
+
+EAPI=4
+
+inherit eutils linux-info
+
+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"
+REQUIRED_USE="dracut_modules_livenet? ( dracut_modules_dmsquash-live )
+	dracut_modules_crypt-gpg? ( dracut_modules_crypt )
+	"
+
+COMMON_MODULES="
+	dracut_modules_biosdevname
+	dracut_modules_btrfs
+	dracut_modules_caps
+	dracut_modules_crypt-gpg
+	dracut_modules_gensplash
+	dracut_modules_mdraid
+	dracut_modules_multipath
+	dracut_modules_plymouth
+	dracut_modules_syslog
+	"
+NETWORK_MODULES="
+	dracut_modules_iscsi
+	dracut_modules_livenet
+	dracut_modules_nbd
+	dracut_modules_nfs
+	"
+DM_MODULES="
+	dracut_modules_crypt
+	dracut_modules_dmraid
+	dracut_modules_dmsquash-live
+	dracut_modules_livenet
+	dracut_modules_lvm
+	"
+IUSE_DRACUT_MODULES="${COMMON_MODULES} ${DM_MODULES} ${NETWORK_MODULES}"
+IUSE="debug selinux ${IUSE_DRACUT_MODULES}"
+RESTRICT="test"
+
+NETWORK_DEPS=">=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.8
+	>=sys-apps/sysvinit-2.87-r3
+	>=sys-apps/util-linux-2.20
+	>=sys-fs/udev-164
+	app-arch/cpio
+
+	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_crypt-gpg? ( app-crypt/gnupg )
+	dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools ${DM_DEPS} )
+	dracut_modules_dmsquash-live? ( ${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 ) )
+	"
+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"
+}
+
+src_compile() {
+	emake WITH_SWITCH_ROOT=0
+}
+
+src_install() {
+	emake WITH_SWITCH_ROOT=0 \
+		prefix=/usr sysconfdir=/etc DESTDIR="${D}" \
+		install
+
+	local gen2conf
+
+	dodir /var/lib/dracut/overlay
+	dodoc HACKING TODO AUTHORS NEWS README*
+
+	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}
+
+	insinto /etc/logrotate.d
+	newins dracut.logrotate dracut
+
+	#
+	# Modules
+	#
+	local module
+	modules_dir="${D}/usr/lib/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 95fcoe # no tools
+	# fips module depends on masked app-crypt/hmaccalc
+	rm_module 01fips 02fips-aesni
+
+	# Remove extra modules which go to future dracut-extras
+	rm_module 00bootchart 05busybox 97masterkey 98ecryptfs 98integrity
+}
+
+pkg_postinst() {
+	if linux-info_get_any_version && linux_config_src_exists; then
+		echo
+		ewarn "If the following test report contains a missing kernel"
+		ewarn "configuration option, you should reconfigure and rebuild your"
+		ewarn "kernel before booting image generated with this Dracut version."
+		echo
+
+		local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
+
+		# Kernel configuration options descriptions:
+		local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev"
+		local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\
+"(initramfs/initrd) support"
+
+		local opt desc
+
+		# Generate ERROR_* variables for check_extra_config.
+		for opt in ${CONFIG_CHECK}; do
+			opt=${opt#\~}
+			desc=desc_${opt}
+			eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \
+				"is missing and REQUIRED'"
+		done
+
+		check_extra_config
+		echo
+	fi
+
+	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 'To include only dracut modules and kernel drivers for this system,'
+	elog 'use the "-H" option.  Some modules need to be explicitly added with'
+	elog '"-a" option even if required tools are installed.'
+}
diff --git a/sys-kernel/dracut/files/dracut-016-multipath-udev-rules.patch b/sys-kernel/dracut/files/dracut-016-multipath-udev-rules.patch
new file mode 100644
index 000000000000..2b9cffad38c4
--- /dev/null
+++ b/sys-kernel/dracut/files/dracut-016-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
+