diff options
author | Amadeusz Żołnowski <aidecoe@gentoo.org> | 2011-11-16 14:32:29 +0000 |
---|---|---|
committer | Amadeusz Żołnowski <aidecoe@gentoo.org> | 2011-11-16 14:32:29 +0000 |
commit | 86e4abe795db7ecbfe8357957ace8251d19fbeaa (patch) | |
tree | a785d27353c919cafdd502e45b674b47983841e4 /sys-kernel | |
parent | sys-kernel/dracut-013: Patched Makefile. Fixes bug #390629. Revbump to r2. (diff) | |
download | historical-86e4abe795db7ecbfe8357957ace8251d19fbeaa.tar.gz historical-86e4abe795db7ecbfe8357957ace8251d19fbeaa.tar.bz2 historical-86e4abe795db7ecbfe8357957ace8251d19fbeaa.zip |
sys-kernel/dracut: Removed old versions: 010 and 011.
Package-Manager: portage-2.1.10.34/cvs/Linux x86_64
Diffstat (limited to 'sys-kernel')
-rw-r--r-- | sys-kernel/dracut/ChangeLog | 11 | ||||
-rw-r--r-- | sys-kernel/dracut/Manifest | 27 | ||||
-rw-r--r-- | sys-kernel/dracut/dracut-010-r3.ebuild | 217 | ||||
-rw-r--r-- | sys-kernel/dracut/dracut-011-r1.ebuild | 217 | ||||
-rw-r--r-- | sys-kernel/dracut/dracut-011.ebuild | 216 | ||||
-rw-r--r-- | sys-kernel/dracut/files/dracut-010-empty-etc-ld.so.conf.d.patch | 27 | ||||
-rw-r--r-- | sys-kernel/dracut/files/dracut-010-multipath-udev-rules.patch | 24 | ||||
-rw-r--r-- | sys-kernel/dracut/files/dracut-010-rd.driver.post-fixed.patch | 36 | ||||
-rw-r--r-- | sys-kernel/dracut/files/dracut-010-rd.driver.pre-and-blacklist-fix.patch | 35 | ||||
-rw-r--r-- | sys-kernel/dracut/files/dracut-011-integrated-initramfs-fix.patch | 27 | ||||
-rw-r--r-- | sys-kernel/dracut/files/dracut-011-multipath-udev-rules.patch | 24 |
11 files changed, 18 insertions, 843 deletions
diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog index 14fdc5924fac..216ba92875a3 100644 --- a/sys-kernel/dracut/ChangeLog +++ b/sys-kernel/dracut/ChangeLog @@ -1,6 +1,15 @@ # 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.34 2011/11/16 14:27:32 aidecoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.35 2011/11/16 14:32:29 aidecoe Exp $ + + 16 Nov 2011; Amadeusz Żołnowski <aidecoe@gentoo.org> -dracut-010-r3.ebuild, + -files/dracut-010-empty-etc-ld.so.conf.d.patch, + -files/dracut-010-multipath-udev-rules.patch, + -files/dracut-010-rd.driver.post-fixed.patch, + -files/dracut-010-rd.driver.pre-and-blacklist-fix.patch, -dracut-011.ebuild, + -dracut-011-r1.ebuild, -files/dracut-011-integrated-initramfs-fix.patch, + -files/dracut-011-multipath-udev-rules.patch: + Removed old versions: 010 and 011. *dracut-013-r2 (16 Nov 2011) diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest index fb0c7a95686c..c7cd0e912a87 100644 --- a/sys-kernel/dracut/Manifest +++ b/sys-kernel/dracut/Manifest @@ -1,35 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -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 -AUX dracut-010-rd.driver.post-fixed.patch 1080 RMD160 2ab3ff1c7fef4d8d8e1fa1f5176b42e2b390fe16 SHA1 4c7ddc8dca44138c0fede8c218487aa8787547e7 SHA256 a03f0beaf47b4afde8f4945f97ae240edc1a61d71653c8c6e5120bfcbacb530b -AUX dracut-010-rd.driver.pre-and-blacklist-fix.patch 1152 RMD160 49981662b15e9a5bdcba577acae19c4a1ad7eb11 SHA1 88b06237813c8e0a4f6266dc2d62870e67b94671 SHA256 cc4e049e02a89a5fb4d78e42dea970f11e726608aab20b4e69d35e712c106119 -AUX dracut-011-integrated-initramfs-fix.patch 800 RMD160 a870763a3c4c5a9acdafea582da55c7cd8b9446a SHA1 8d3a938c1626bcae049f89dab83386b529a6e8ea SHA256 4eed4888a9489c76eaab774980e45d2ca63f40834b6b81891352696e6e0fac4a -AUX dracut-011-multipath-udev-rules.patch 848 RMD160 99527326b1c5c33647a750d4bba2da9b6b5f0c92 SHA1 353c065322645f063fd3ae90ece7635eab8225ed SHA256 0e2215897b7cbac1bf9c84b42d6eb8af4438674934749bc339f768cba6662c18 AUX dracut-013-integrated-initramfs-fix.patch 800 RMD160 a870763a3c4c5a9acdafea582da55c7cd8b9446a SHA1 8d3a938c1626bcae049f89dab83386b529a6e8ea SHA256 4eed4888a9489c76eaab774980e45d2ca63f40834b6b81891352696e6e0fac4a AUX dracut-013-livenet-gentoo-ca-bundle-path.patch 2434 RMD160 6b25686da38045cd5263672cf638a3fc27cf6a02 SHA1 31828b1eb4499c967814acfbfc38b3c9a11bfeba SHA256 e4fad958c9eb458e6ca131b63033d1631252726e6192d4da285056b8dfd27cfa AUX dracut-013-makefile-manpages.patch 1351 RMD160 09f3fe7b488b3ff5aaa11f7c8a671cf342b35c78 SHA1 d0d42f0e0459f7733f34daa785064bafb754b131 SHA256 3eb118087ea1e3e816d6bc912075eb7d086a22cfb774c7b224fe707581740568 AUX dracut-013-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-011.tar.bz2 146262 RMD160 5ec3584f92590ee27e2ee6ecfbd25edead1c82a2 SHA1 0b4be17638439e54122731dca147a8b5da1bb045 SHA256 ca27f8996776eee9e462eff46d862f9e930d5c424b1af0efb2910dc5ab4d4a4a DIST dracut-013.tar.bz2 149337 RMD160 0d0eb8a84ea0cd208afe433f28e49bfb0b423209 SHA1 1e1c7fd6f7919399fb20f25f662d0529b61f4078 SHA256 5e63cd711f28e13088a095186095e1af2561be422d1e5d0e4ab351205010c717 -EBUILD dracut-010-r3.ebuild 6065 RMD160 09bf1d01e9dcf45059056ef340448bf397e25704 SHA1 acb1c38c53d6de20c5898fd6a57f62fb5a0256df SHA256 f7c3bfb5dee705bf983420c623010a9251dbd1f32f7998f2e5bf5a7045dbb6d3 -EBUILD dracut-011-r1.ebuild 6021 RMD160 06a9d68fb3f9e80697a0b27e49faa449554e2aca SHA1 4cbb818cf61277e6149f90b3b81781f7a0ee523c SHA256 b62142598c0b9a28e323539990d9c1272a714ed3a3c5bbba6f0ae1a9ecfdcbfc -EBUILD dracut-011.ebuild 5960 RMD160 9f467e6ba6518e2259b6f213863d10eb2fb0ed13 SHA1 88303a30149c9539a21f2fb2d3cc4cb4892af0eb SHA256 f37f27cba5d32dba22447dda2cd1eeede2e29c88d7445d3d431e942492aecb3c EBUILD dracut-013-r1.ebuild 6319 RMD160 d0f27cde84b0c9b473e4d6b6f3422feb7c63356f SHA1 c27feeedc504d36c2d98fc172a0c860cf9369ea6 SHA256 e9afd5181e162d07b94228fd2c465e470af058d6c309b108a78cba8e9edc66c1 EBUILD dracut-013-r2.ebuild 6358 RMD160 b5032e1e7b6aad9291819474ee2527cbd93a5c74 SHA1 84bcde740a5f59bbc86df7cb67ea4c2d7ca66387 SHA256 d068b0b40efb8c589e5f22d5642421781efba38ed71476eb119a1ef32db89bba EBUILD dracut-013.ebuild 6258 RMD160 7f48a81e4c1db80e69d0da2ccd9eb090b35d5c54 SHA1 18b098d738e953dee7dec329881cde5b0b54b2aa SHA256 f00e5c6bf96f19694d34137882551684f4341e847e862ecf4ab3dbaae48ebacc -MISC ChangeLog 10551 RMD160 43c030f34e86bf72730b7f013ba116b890b1f2d1 SHA1 fcfd45166b3820d01af1e5ddf2a2ea4ec8087802 SHA256 7acd16507ddb228a262c51504f5e6c950e216469af301083ba2c519ae59f2bfe +MISC ChangeLog 11017 RMD160 2fb8ba391f2ffe56cbb703b909c3596e32d3f3f5 SHA1 c9a012ca8aee527db7d73a02b502430e7cdc26ad SHA256 d3aef552c886da45ff604cb58e5a4e646bbca7d106d1dac164fee33735c93b51 MISC metadata.xml 602 RMD160 cd11704bfcf7aca599c2671b91416112fdb2cc75 SHA1 d2345b2bb4d17a6887754a7569d7d91f32f42df2 SHA256 c234e9242c61200d81fe2ba3b58deaab911bc36413d657a61580ca6de69f2412 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBAgAGBQJOw8haAAoJEPATRTHh2/q10gAH/3w2N7lTClptw2UaSO4RjmW/ -LkahhpEkOKFWzI5/60ZGAEiUX/cyBSN33d4nkAM/8QO7ZfCDSKO3m6uhxIa8P/Va -kikv4fz+GhrEmXgjlIaue6tT12JCj4N7w0XOB0Mm4RpnCNkd5CP1OpBc7YUK5HvE -h+56kkCSe3PTrwA9EG2sjKNrDEAbbfPR3XN+sufQ+4eIq2E4wlv20BTFdPoyXttp -yWH1gdcZ1fZR5zrpiyzsvT2wRasof76Mp5aVhqMMlAlrWTRsphC4ZnNZpI+pRHVy -jglWBEG96OoYvrCBbuWQiB0bEpliOLUBSksR7uvpraPZ7iu5UtRd0h2T3cz2A2Y= -=zV01 +iQEcBAEBAgAGBQJOw8mCAAoJEPATRTHh2/q1Zu4H/2gPjE5C4caSvz7c9Q6dyjGg +524+a7nErm4RFELkOZlxY/7Lr9zEkv4JRKt0NhZHVO9r4a8VlCK2fOCILLU77eLk +fps518C8HD1hDcw/40O+rGfkVBzkQkeTOHX6XD2sKXckKggBtoAKfnw16Rz/nZ0Q +Y/2T2BvEz1Vksg+b39ae9rTp/HBYcQv3bU6eH4w0qt5Go9gxCznNSzeR1L8q6U42 +vXce/lnmb+TdtjEy3MxQ0u+vHqsyKja4Hi38YfkOBa/Nu4sJuf8liLAsT0+PzMLh +doElDA2OT2T2ahtFYfUTtCLgMWfvchIbeWG4uhofsFWTY7MI5ib4IPudLcXRw7o= +=9MgW -----END PGP SIGNATURE----- diff --git a/sys-kernel/dracut/dracut-010-r3.ebuild b/sys-kernel/dracut/dracut-010-r3.ebuild deleted file mode 100644 index adb0495c7334..000000000000 --- a/sys-kernel/dracut/dracut-010-r3.ebuild +++ /dev/null @@ -1,217 +0,0 @@ -# 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-r3.ebuild,v 1.2 2011/09/09 20:54:53 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}" -RESTRICT="test" - -NETWORK_DEPS="net-misc/bridge-utils >=net-misc/dhcp-4.2.1-r1 sys-apps/iproute2 - net-misc/ifenslave" -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 - 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_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools ${DM_DEPS} ) - dracut_modules_dmsquash-live? ( virtual/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" - epatch "${FILESDIR}/${P}-rd.driver.post-fixed.patch" - epatch "${FILESDIR}/${P}-rd.driver.pre-and-blacklist-fix.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/dracut-011-r1.ebuild b/sys-kernel/dracut/dracut-011-r1.ebuild deleted file mode 100644 index 05d26b6ca3b3..000000000000 --- a/sys-kernel/dracut/dracut-011-r1.ebuild +++ /dev/null @@ -1,217 +0,0 @@ -# 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-011-r1.ebuild,v 1.2 2011/09/09 20:54:53 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_crypt-gpg - 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}" -RESTRICT="test" - -NETWORK_DEPS="net-misc/bridge-utils >=net-misc/dhcp-4.2.1-r1 sys-apps/iproute2 - net-misc/ifenslave" -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.16 - >=sys-fs/udev-168 - 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? ( virtual/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}-integrated-initramfs-fix.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/dracut-011.ebuild b/sys-kernel/dracut/dracut-011.ebuild deleted file mode 100644 index 2f5e53071302..000000000000 --- a/sys-kernel/dracut/dracut-011.ebuild +++ /dev/null @@ -1,216 +0,0 @@ -# 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-011.ebuild,v 1.2 2011/09/09 20:54:53 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_crypt-gpg - 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}" -RESTRICT="test" - -NETWORK_DEPS="net-misc/bridge-utils >=net-misc/dhcp-4.2.1-r1 sys-apps/iproute2 - net-misc/ifenslave" -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.16 - >=sys-fs/udev-168 - 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? ( virtual/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" -} - -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 deleted file mode 100644 index e3cfc1227f47..000000000000 --- a/sys-kernel/dracut/files/dracut-010-empty-etc-ld.so.conf.d.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 - diff --git a/sys-kernel/dracut/files/dracut-010-multipath-udev-rules.patch b/sys-kernel/dracut/files/dracut-010-multipath-udev-rules.patch deleted file mode 100644 index 2b9cffad38c4..000000000000 --- a/sys-kernel/dracut/files/dracut-010-multipath-udev-rules.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 - diff --git a/sys-kernel/dracut/files/dracut-010-rd.driver.post-fixed.patch b/sys-kernel/dracut/files/dracut-010-rd.driver.post-fixed.patch deleted file mode 100644 index 3a036d7655d8..000000000000 --- a/sys-kernel/dracut/files/dracut-010-rd.driver.post-fixed.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 969a4a6b82cfe36fada9c3813ef81cb3641863af Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name> -Date: Thu, 30 Jun 2011 22:43:34 +0200 -Subject: [PATCH 2/2] 90kernel-modules: fixed handling rd.driver.post= - -Conflicts: - - modules.d/90kernel-modules/insmodpost.sh ---- - modules.d/90kernel-modules/insmodpost.sh | 8 +++++--- - 1 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/modules.d/90kernel-modules/insmodpost.sh b/modules.d/90kernel-modules/insmodpost.sh -index c3d7714..168a907 100755 ---- a/modules.d/90kernel-modules/insmodpost.sh -+++ b/modules.d/90kernel-modules/insmodpost.sh -@@ -2,11 +2,13 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - --for p in $(getargs rd.driver.post rdinsmodpost=); do -+. /lib/dracut-lib.sh -+ -+for modlist in $(getargs rd.driver.post rdinsmodpost=); do - ( - IFS=, -- for p in $i; do -- modprobe $p -+ for m in $modlist; do -+ modprobe $m - done - ) - done --- -1.7.5.3 - diff --git a/sys-kernel/dracut/files/dracut-010-rd.driver.pre-and-blacklist-fix.patch b/sys-kernel/dracut/files/dracut-010-rd.driver.pre-and-blacklist-fix.patch deleted file mode 100644 index 58d4287e5309..000000000000 --- a/sys-kernel/dracut/files/dracut-010-rd.driver.pre-and-blacklist-fix.patch +++ /dev/null @@ -1,35 +0,0 @@ -From ce09d0ea4ddf01076453de6dde6f86cf6f12113d Mon Sep 17 00:00:00 2001 -From: Harald Hoyer <harald@redhat.com> -Date: Fri, 6 May 2011 12:06:20 +0200 -Subject: [PATCH 1/2] parse-kernel.sh: wrong index was used in for loop - -Thanks Mike Snitzer <msnitzer@redhat.com> ---- - modules.d/90kernel-modules/parse-kernel.sh | 4 ++-- - 1 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/modules.d/90kernel-modules/parse-kernel.sh b/modules.d/90kernel-modules/parse-kernel.sh -index fceccaa..9323d42 100755 ---- a/modules.d/90kernel-modules/parse-kernel.sh -+++ b/modules.d/90kernel-modules/parse-kernel.sh -@@ -2,7 +2,7 @@ - # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- - # ex: ts=8 sw=4 sts=4 et filetype=sh - --for p in $(getargs rd.driver.pre rdloaddriver=); do -+for i in $(getargs rd.driver.pre rdloaddriver=); do - ( - IFS=, - for p in $i; do -@@ -11,7 +11,7 @@ for p in $(getargs rd.driver.pre rdloaddriver=); do - ) - done - --for p in $(getargs rd.driver.blacklist rdblacklist=); do -+for i in $(getargs rd.driver.blacklist rdblacklist=); do - ( - IFS=, - for p in $i; do --- -1.7.5.3 - diff --git a/sys-kernel/dracut/files/dracut-011-integrated-initramfs-fix.patch b/sys-kernel/dracut/files/dracut-011-integrated-initramfs-fix.patch deleted file mode 100644 index df41f00253c6..000000000000 --- a/sys-kernel/dracut/files/dracut-011-integrated-initramfs-fix.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 1a553e2bc9f3157cdd6957ab55dfc4b62d82dec6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name> -Date: Sun, 4 Sep 2011 16:30:39 +0200 -Subject: [PATCH] dracut: create /dev besides /proc, /sys and so - -How it worked without it? The issue only manifests itself with -initramfs integrated into kernel. ---- - dracut | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/dracut b/dracut -index fd36805..b317d70 100755 ---- a/dracut -+++ b/dracut -@@ -510,7 +510,7 @@ if [[ $kernel_only != yes ]]; then - fi - done - -- for d in proc sys sysroot root run run/lock run/initramfs; do -+ for d in dev proc sys sysroot root run run/lock run/initramfs; do - if [ -h "/$d" ]; then - inst "/$d" - else --- -1.7.6.1 - diff --git a/sys-kernel/dracut/files/dracut-011-multipath-udev-rules.patch b/sys-kernel/dracut/files/dracut-011-multipath-udev-rules.patch deleted file mode 100644 index 2b9cffad38c4..000000000000 --- a/sys-kernel/dracut/files/dracut-011-multipath-udev-rules.patch +++ /dev/null @@ -1,24 +0,0 @@ -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 - |