From: Lance Albertson Date: Wed, 7 Jul 2010 05:32:16 +0000 (+0000) Subject: Version bump, resolves bug #324705 X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=34eef038d3e507e56264c3792eb8561042b7923d;p=gentoo.git Version bump, resolves bug #324705 Package-Manager: portage-2.1.8.3/cvs/Linux x86_64 --- diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog index 8efe79ad91bc..657625213e27 100644 --- a/sys-kernel/dracut/ChangeLog +++ b/sys-kernel/dracut/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for sys-kernel/dracut # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.4 2010/03/22 01:27:20 jmbsvicetto Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.5 2010/07/07 05:32:16 ramereth Exp $ + +*dracut-006 (07 Jul 2010) + + 07 Jul 2010; Lance Albertson +dracut-006.ebuild, + +files/dracut-006-dhcp6.patch, +files/dracut-006-lc-all-c.patch, + metadata.xml: + Version bump, resolves bug #324705 + + Thanks to Amadeusz Żołnowski for submitting the ebuild and patches. 22 Mar 2010; Jorge Manuel B. S. Vicetto metadata.xml: diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest index 9aae00f933a2..6aca9b94bbc3 100644 --- a/sys-kernel/dracut/Manifest +++ b/sys-kernel/dracut/Manifest @@ -1,14 +1,28 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + AUX dracut-002-add-missing-functions.patch 1134 RMD160 4b8298e5d2c632ad33f768070d5520c0618844b6 SHA1 0bab1aac2af402b2531d14ae46ab372ab2d3c015 SHA256 ac64c5c68f8f3f8057646d26b29e6d51e00ce7000dd240b6829cfaee153fcf9b AUX dracut-002-custom-paths.patch 995 RMD160 a5eb1f733fe78a40699f028a69f01815c31f1557 SHA1 da30e093309acff0f3728b6b6c7345eb1fcfa94a SHA256 9e0ac4dd0f17e62bf9d3a688143dd0fc7fd1b97e3df9d3e654d3c7ba73d9dc33 AUX dracut-002-dir-symlinks.patch 3223 RMD160 0783bfd8172d1e27c0ef79a3973bb69e8cd36a4a SHA1 598f4fcc75f4244a9427480efad9f22ed947b402 SHA256 f71f8ad53e2fa0aefe592ad74fd32d2407f1375a8201673d06ffe6d2de02e5dd AUX dracut-002-gencmdline-check-for-keyboard-i18n-files.patch 795 RMD160 9f41b536a51a14cfb31e4ad9f9c1c8eae3c14d99 SHA1 c145d1fc5ee99dd1226c62f3dd15c55c482ef58a SHA256 5e19deded988923ac4fe79e525d7964ae8052bb9578fe67847fd873aefaedfe5 AUX dracut-002-makefile-add-with_switch_root.patch 1517 RMD160 5b936eb43fc6a7248c30d94185907d3b551668b6 SHA1 cb1c1552563ad03c94c96e99c558522931f238f2 SHA256 2f7389c3f869f396b4d3dd0f872314a9f490eea74c95725f8c2909d22789e15c AUX dracut-002-unmount.patch 1222 RMD160 4a1ca39fdb84b538047e96963524af9b7ad565c6 SHA1 ce07c883eda5086ce5f9427334276d5c87c517a5 SHA256 6b27f01342b595c19d1324b647b1800d7f0ce4f2bd89da6ee5b14d87ab272f5e +AUX dracut-006-dhcp6.patch 544 RMD160 16f030b7c6184fa7c649aec5e81b2c32f264cb5a SHA1 377138f04c03901cc4499525f5035542d71c61ed SHA256 bec6cdf1a85a3e4df2527ac1d8a2d29a73373bbb878dc93123a6a9711fe3bbbf +AUX dracut-006-lc-all-c.patch 527 RMD160 8f0edd1dc093cec98ed8e57d8cbff528ea97e6d2 SHA1 aa85bd1df4c25e7a48f35162bcefa1aec981ade5 SHA256 588cff03ef0e1a6e519f3e15626b21a500ba1bc13b0d7493baa544033bd34361 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 EBUILD dracut-002-r1.ebuild 2828 RMD160 9a920a2ce5f25afc6060798db3a99849668ee028 SHA1 d4d5ea001be7f6255c69abf31ca860e542ecff8e SHA256 7493b47c6208ea371660ef2ec65dd3f4d72d3d0f3dab5668304079fab352acc0 EBUILD dracut-003.ebuild 2474 RMD160 8f53fe04670209c18ee7e7463b92bcfe911007fd SHA1 0a8312aa9ede22379dfc02a35ff18b5b775688fe SHA256 20073f8170cee6a13a3f4b4187efc5021e820ce08e4b7c9058a2392e4f07975b EBUILD dracut-004.ebuild 2474 RMD160 534ac5f5d264da262c8d69c539cdc2845570c986 SHA1 f4d53a1e0d91c343451e2dc813b01dec08910b4a SHA256 1ecdc47c920e83254ef4d03e61963bd55c760907c5bfd024dc8499e66b59a8c1 -MISC ChangeLog 1557 RMD160 71ba21fd4cdffb59279729ca4a07e7e5d3c8b6d0 SHA1 d1ca9124056cdde4f7ccecad29e0513e35caf5e0 SHA256 3413f2a982fc51f008cc69fabdd1f35b2deb96bd1408371c3e4be8522145e93b -MISC metadata.xml 850 RMD160 7d0f722c16dd40cec8583960fb41333d379bb356 SHA1 97dda5f629be838d1d40a2dfbcce228950eb3308 SHA256 0b28695fd8febc5adc9d8babd4b52cfca1908d37b50c2f344c1dcfa0f771d29d +EBUILD dracut-006.ebuild 2897 RMD160 d0d0d03c45f0fbeef08be6b423b51316f5b444f8 SHA1 0fffd1d71e15a390348244633ef0ee494d8470ff SHA256 3c6e4e0810b169192c8fb247fb5333c11661d6490dcca2103a97bee38dac4592 +MISC ChangeLog 1848 RMD160 057e79795d560986df12bcce988ba7b03de8fa94 SHA1 507ee4469df86cd8ca1b38bc135f435bba64777c SHA256 3fc4ef9eda273972e1fc19d6d39e951a0cffc15640f8a94e74346affde62fb6d +MISC metadata.xml 1077 RMD160 97e274c9dcc19ea7b2a306162bc8eaf90fa6027e SHA1 6692f6cc48faa75e102dba0021c023549bf1d98a SHA256 70ecba2084a33f28b5d552a6cd1f8ef484e5dbab9b0fd3d3947d4a3c268f356f +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.15 (GNU/Linux) + +iD8DBQFMNBFnQW+hXSf0t0IRApAlAKCqCrSkOxhCUzx0d61a4TFrCETuWwCguTfD +fUE+SA92uI5CYVeSldBjhyA= +=u+6R +-----END PGP SIGNATURE----- diff --git a/sys-kernel/dracut/dracut-006.ebuild b/sys-kernel/dracut/dracut-006.ebuild new file mode 100644 index 000000000000..d541d91e7a8b --- /dev/null +++ b/sys-kernel/dracut/dracut-006.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2010 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-006.ebuild,v 1.1 2010/07/07 05:32:16 ramereth Exp $ + +EAPI=2 + +inherit eutils mount-boot + +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="~amd64 ~x86" +IUSE="btrfs crypt dmraid iscsi lvm multipath nbd nfs md selinux uswsusp xen" + +# common networking deps +NETWORK_DEPS="sys-apps/iproute2 net-misc/dhcp net-misc/bridge-utils" + +RDEPEND="app-shells/dash + sys-apps/module-init-tools + >=sys-apps/util-linux-2.16 + btrfs? ( sys-fs/btrfs-progs ) + crypt? ( sys-fs/cryptsetup ) + dmraid? ( sys-fs/dmraid sys-fs/multipath-tools ) + lvm? ( >=sys-fs/lvm2-2.02.33 ) + md? ( sys-fs/mdadm ) + nfs? ( net-fs/nfs-utils net-nds/rpcbind ${NETWORK_DEPS} ) + iscsi? ( sys-block/open-iscsi[utils] ${NETWORK_DEPS} ) + multipath? ( sys-fs/multipath-tools ) + nbd? ( sys-block/nbd ${NETWORK_DEPS} ) + selinux? ( sys-libs/libselinux sys-libs/libsepol ) + uswsusp? ( sys-power/suspend ) + xen? ( app-emulation/xen ) + " +DEPEND="${RDEPEND}" + +src_prepare() { + epatch "${FILESDIR}/${P}-dhcp6.patch" + epatch "${FILESDIR}/${P}-lc-all-c.patch" +} + +src_compile() { + emake WITH_SWITCH_ROOT=0 prefix=/usr sysconfdir=/etc || die "emake failed" +} + +src_install() { + local modules_dir="${D}/usr/share/dracut/modules.d" + + emake WITH_SWITCH_ROOT=0 \ + prefix=/usr sysconfdir=/etc \ + DESTDIR="${D}" install || die "emake install failed" + echo "${PF}" > "${modules_dir}"/10rpmversion/dracut-version + dodir /boot/dracut /var/lib/dracut/overlay + dodoc HACKING TODO AUTHORS NEWS README* + # disable modules not enabled by use flags + for module in btrfs crypt dmraid lvm md multipath uswsusp xen ; do + ! use ${module} && rm -rf ${modules_dir}/90${module} + done + # disable all network modules + for module in iscsi nbd nfs ; do + ! use ${module} && rm -rf ${modules_dir}/95${module} + done + # if no networking at all, disable the rest + if ! use iscsi && ! use nbd && ! use nfs ; then + rm -rf ${modules_dir}/40network + fi + # disable modules which won't work for sure + rm -rf ${modules_dir}/01fips + rm -rf ${modules_dir}/10redhat-i18n + rm -rf ${modules_dir}/95fcoe +} + +pkg_postinst() { + elog 'To generate the initramfs:' + elog ' # mount /boot (if necessary)' + elog ' # dracut "" ' + elog '' + elog 'For command line documentation, see:' + elog 'http://sourceforge.net/apps/trac/dracut/wiki/commandline' + elog '' + elog 'Simple example to select root and resume partition:' + elog ' root=/dev/???? resume=/dev/????' + elog '' + elog 'Configuration is in /etc/dracut.conf.' + elog 'The default config is very minimal and is highly recommended you' + elog 'adjust based on your needs. To include only drivers for this system,' + elog 'use the "-H" option.' +} diff --git a/sys-kernel/dracut/files/dracut-006-dhcp6.patch b/sys-kernel/dracut/files/dracut-006-dhcp6.patch new file mode 100644 index 000000000000..930dcae092ba --- /dev/null +++ b/sys-kernel/dracut/files/dracut-006-dhcp6.patch @@ -0,0 +1,13 @@ +diff --git a/modules.d/40network/parse-ip-opts.sh b/modules.d/40network/parse-ip-opts.sh +index 7362669..a3c9597 100755 +--- a/modules.d/40network/parse-ip-opts.sh ++++ b/modules.d/40network/parse-ip-opts.sh +@@ -74,7 +74,7 @@ for p in $(getargs ip=); do + die "Sorry, automatic calculation of netmask is not yet supported" + ;; + auto6);; +- dhcp|on|any) \ ++ dhcp|dhcp6|on|any) \ + [ -n "$NEEDBOOTDEV" ] && [ -z "$dev" ] && \ + die "Sorry, 'ip=$p' does not make sense for multiple interface configurations" + [ -n "$ip" ] && \ diff --git a/sys-kernel/dracut/files/dracut-006-lc-all-c.patch b/sys-kernel/dracut/files/dracut-006-lc-all-c.patch new file mode 100644 index 000000000000..4b13fb2367ae --- /dev/null +++ b/sys-kernel/dracut/files/dracut-006-lc-all-c.patch @@ -0,0 +1,13 @@ +diff --git a/dracut-functions b/dracut-functions +index 58f119f..2cd573a 100755 +--- a/dracut-functions ++++ b/dracut-functions +@@ -248,7 +248,7 @@ inst_binary() { + local LDSO NAME IO FILE ADDR I1 n f TLIBDIR + [[ -e $initdir$target ]] && return 0 + # I love bash! +- ldd $bin 2>/dev/null | while read line; do ++ LC_ALL=C ldd $bin 2>/dev/null | while read line; do + [[ $line = 'not a dynamic executable' ]] && return 1 + if [[ $line =~ not\ found ]]; then + derror "Missing a shared library required by $bin." diff --git a/sys-kernel/dracut/metadata.xml b/sys-kernel/dracut/metadata.xml index 4eb217cbd7ed..7146516448d6 100644 --- a/sys-kernel/dracut/metadata.xml +++ b/sys-kernel/dracut/metadata.xml @@ -15,6 +15,10 @@ Add support for network block devices Add support for NFS Add support for MD devices, also known as software raid devices + Add support for btrfs + Add support for multipath + Add support for userspace software suspend + Add support for Xen Generic, modular initramfs generation tool that can be used across various