From e6f1185ee27563c5b2ff0d849ede7ea299df65bd Mon Sep 17 00:00:00 2001 From: =?utf8?q?Amadeusz=20=C5=BBo=C5=82nowski?= Date: Wed, 31 Aug 2011 13:05:42 +0000 Subject: [PATCH] sys-kernel/dracut: Removed older ebuilds (<010) and patches. Package-Manager: portage-2.1.10.11/cvs/Linux x86_64 --- sys-kernel/dracut/ChangeLog | 13 +- sys-kernel/dracut/Manifest | 30 +-- sys-kernel/dracut/dracut-007.ebuild | 183 --------------- sys-kernel/dracut/dracut-008.ebuild | 208 ----------------- sys-kernel/dracut/dracut-009-r1.ebuild | 213 ------------------ .../files/dracut-007-dm-udev-rules.patch | 60 ----- .../dracut-007-multipath-udev-rules.patch | 46 ---- .../files/dracut-008-dm-udev-rules.patch | 62 ----- ...i18n-config-file-parsing-in-hostonly.patch | 30 --- .../dracut-008-multipath-udev-rules.patch | 24 -- ...on-t-skip-zero-length-string-outfile.patch | 32 --- .../dracut-009-multipath-udev-rules.patch | 24 -- sys-kernel/dracut/metadata.xml | 14 -- 13 files changed, 21 insertions(+), 918 deletions(-) delete mode 100644 sys-kernel/dracut/dracut-007.ebuild delete mode 100644 sys-kernel/dracut/dracut-008.ebuild delete mode 100644 sys-kernel/dracut/dracut-009-r1.ebuild delete mode 100644 sys-kernel/dracut/files/dracut-007-dm-udev-rules.patch delete mode 100644 sys-kernel/dracut/files/dracut-007-multipath-udev-rules.patch delete mode 100644 sys-kernel/dracut/files/dracut-008-dm-udev-rules.patch delete mode 100644 sys-kernel/dracut/files/dracut-008-i18n-config-file-parsing-in-hostonly.patch delete mode 100644 sys-kernel/dracut/files/dracut-008-multipath-udev-rules.patch delete mode 100644 sys-kernel/dracut/files/dracut-009-don-t-skip-zero-length-string-outfile.patch delete mode 100644 sys-kernel/dracut/files/dracut-009-multipath-udev-rules.patch diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog index 7403a068ef3f..f5dc36f89c47 100644 --- a/sys-kernel/dracut/ChangeLog +++ b/sys-kernel/dracut/ChangeLog @@ -1,6 +1,17 @@ # 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.29 2011/08/31 09:47:13 aidecoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.30 2011/08/31 13:05:42 aidecoe Exp $ + + 31 Aug 2011; Amadeusz Żołnowski -dracut-007.ebuild, + -files/dracut-007-dm-udev-rules.patch, + -files/dracut-007-multipath-udev-rules.patch, -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, -dracut-009-r1.ebuild, + -files/dracut-009-don-t-skip-zero-length-string-outfile.patch, + -files/dracut-009-multipath-udev-rules.patch, metadata.xml: + Removed older ebuilds (<010) with corresponding files. metadata.xml was + cleaned up from flags descriptions which are used no more. 31 Aug 2011; Amadeusz Żołnowski dracut-013.ebuild: Added 'crypt' requirement for 'crypt-gpg'. diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest index de3b97837616..5801f053d9db 100644 --- a/sys-kernel/dracut/Manifest +++ b/sys-kernel/dracut/Manifest @@ -1,13 +1,6 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 -AUX dracut-007-dm-udev-rules.patch 2048 RMD160 20bb37d057b58a523a5bc28fb69fc3b9c231370c SHA1 867ada86c0949106d5b18c69b9e52dbd3cf28e97 SHA256 690a85d5623e673cb43d228ecf4c669bb9e231ec4fd197dac8d66f957eaa98f6 -AUX dracut-007-multipath-udev-rules.patch 1327 RMD160 616179d21a205b477e729e15b074380432b1154c SHA1 08e20308f983574cb52f567de7fe85d5df61a1e1 SHA256 2df06515c59fe64a461f63444793ae1af287b46be9ddd61f3310f6a87ad830f0 -AUX dracut-008-dm-udev-rules.patch 2199 RMD160 3aa90576ccf5f01ff65a02e8baaa0357dc8e2f62 SHA1 b4cece3c29679d9f6fca5f2a47e2fe7ecde863c2 SHA256 9d3d91155bda4c6197712b013f1cb7bbc4972555189b72b510d7a8ad038ed27c -AUX dracut-008-i18n-config-file-parsing-in-hostonly.patch 966 RMD160 3d37f7f3009c6d20c9bb2c6df5dde8ca5a689aba SHA1 236a1e158fe9227e7fcce9365eb8058f6f83666b SHA256 4611c52798c4d5dc585f6cfe72662a5ff5ae5fdb11907638e124bc97bd490968 -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 AUX dracut-010-rd.driver.post-fixed.patch 1080 RMD160 2ab3ff1c7fef4d8d8e1fa1f5176b42e2b390fe16 SHA1 4c7ddc8dca44138c0fede8c218487aa8787547e7 SHA256 a03f0beaf47b4afde8f4945f97ae240edc1a61d71653c8c6e5120bfcbacb530b @@ -15,29 +8,24 @@ AUX dracut-010-rd.driver.pre-and-blacklist-fix.patch 1152 RMD160 49981662b15e9a5 AUX dracut-011-multipath-udev-rules.patch 848 RMD160 99527326b1c5c33647a750d4bba2da9b6b5f0c92 SHA1 353c065322645f063fd3ae90ece7635eab8225ed SHA256 0e2215897b7cbac1bf9c84b42d6eb8af4438674934749bc339f768cba6662c18 AUX dracut-013-livenet-gentoo-ca-bundle-path.patch 2434 RMD160 6b25686da38045cd5263672cf638a3fc27cf6a02 SHA1 31828b1eb4499c967814acfbfc38b3c9a11bfeba SHA256 e4fad958c9eb458e6ca131b63033d1631252726e6192d4da285056b8dfd27cfa AUX dracut-013-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 -DIST dracut-009.tar.bz2 143623 RMD160 bf9126fd1310f74bf78917f8ea374ded15e7359c SHA1 4b8efde1ac7e82d740873f051309b1fc946a21c4 SHA256 791b4167f78e5c553bdd4165f4753bbe54a3662d90fc7ef695dd15c5c95f68c7 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-007.ebuild 4817 RMD160 b9d983b8cdabc60e0cadf90f1405c76e88731cf8 SHA1 b20bb5f4ecf83aabf428a683d98d42cb3ea36db6 SHA256 6715e399fe0dafa868171a2239e4cca508396ffc09cdd8cb029930c07bef1fff 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 5926 RMD160 1ea8662b9ba97fff4cd7213edff46dd686f9c0cb SHA1 addddc776d153fbf5df75cd5297bb3543ee2c4f3 SHA256 cbc4e30d8b9836d15c3ebc7e5614122734770ef1fa370c2b90c807ae4a8b930d EBUILD dracut-010-r3.ebuild 6050 RMD160 d6bf1562f9956eee52d7d54ac6824a56401b80d5 SHA1 704d2e9f53e82e06f1b904d542b926abb565f6b1 SHA256 377c77f8795b0641c1fc076d50af21544d799f56fa65e64a5aaf4a99754213d9 EBUILD dracut-011.ebuild 5945 RMD160 83d91c5c69415510993af9e86f173def99c90560 SHA1 60f1149dd09ec9a1856ec1d7be2d7fd6524e9344 SHA256 5ffb020b023979218a03b06ff262829eb5ba5dd7b43b1db6f509a26c52a7e7d2 EBUILD dracut-013.ebuild 6243 RMD160 04e2a89398a2d3a01afe624381e4853ea4104949 SHA1 3a9295fb36a63a44e457895f0cd445f20a173899 SHA256 213069727c2ac954e048560a14c7c995ca47dbc069e5e493688eef0fe230ce1f -MISC ChangeLog 8951 RMD160 6024a6f559845408f50478a0fe07098d731852be SHA1 f997b46192064337f88042ca97debab2a4219330 SHA256 37b447826c86ae6fecf1ff529d8b456a523fbb622cc7ffa667b162efcb17ff4b -MISC metadata.xml 1725 RMD160 b297eb03e09381e2b03d98b37755c56f5ebe546d SHA1 145aef995db3cc66ead45189d722c7939c6d0ed7 SHA256 4a4acf6ddbe7fe41200c9bab075f677d46848b09f680a2eab05921a29455316f +MISC ChangeLog 9576 RMD160 552c293c743734e4a05a6ae36856d683bdf1b0d1 SHA1 59e3353cc20f54626f66ca788494a5ef4a59dd76 SHA256 635fbef5092c5ef20276dede20ecf9b92f0a186aef786565ad0459002def303e +MISC metadata.xml 624 RMD160 42a729436ab46593794e94c3a62baab459cb14cc SHA1 85bff3093a413f3084a3aa2fc0d61229fa014753 SHA256 694067a4baec7ea33ae867985b7d7e355d4a02fdfccaa242ce954fcebd93c8d0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBAgAGBQJOXgMnAAoJEPATRTHh2/q1m9UH/R7peGOD2gaqfmKOuMiOoLj7 -uTqI5uH/wWJvVhrFNr7mpWSLQ7lEBJgokSnUOru2bzaPv3CTFFX8mvU1NX3ylQil -L4RbhPUZWN2I01HDP6xQHbfx22vHq9j3VYLOVm4VgwUfhGM2qKrSSN6LAvVV/idq -ssJQjdpiHKEiPADXD7qz8IgOYLRNNgDLZvCW9iXzZrJAUmu1/i/sdQAFkiAYyNTL -2MIz26zgEDWqW1/i77ofaCtL9tgC507VE8EPFayw9QNKcqa3v8SNzhQXTM4NHaLt -7Ginabf0pddDw+CkFjwghnWo9EUKeikjnzDJBj0vYKCvertKP80du/yHA63E5Ag= -=gfQF +iQEcBAEBAgAGBQJOXjGrAAoJEPATRTHh2/q13AYH/3kzUIUHHZ3CFX55NfFI/hPe +txUmJzFsexq/2NkubfM8Pgob/JyBi7lOklcYScAeO6uU229oFCKMwyHQYL9xve0u +xZ3WqZKNH1R3a4gUGr+gkpDGifEhGBnp+5kaiEwELyIyG2UsbtFHBXq55HoX4Rjt +U2J4yT7FN3IbnymlQRl89Wr/KEfNOCjE3A4D3Tiow+Kvi+RwDQtJgw8shKkcyCh/ +l1mSwQ8MWGCQKOpDbeyhu1Feps0F9P9sBbm4RBpDdxobEwQ66tUmK9h/ZoOke9fB +m0iz3Sz/7xmZ8+WpZlLjQi+zl3XqkIuF/GA5TODAuHpLAI7DdogqsIjUKWJiwR4= +=s0Hi -----END PGP SIGNATURE----- diff --git a/sys-kernel/dracut/dracut-007.ebuild b/sys-kernel/dracut/dracut-007.ebuild deleted file mode 100644 index ddf1fd41bfa0..000000000000 --- a/sys-kernel/dracut/dracut-007.ebuild +++ /dev/null @@ -1,183 +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-007.ebuild,v 1.8 2011/03/31 15:26:33 ssuominen Exp $ - -EAPI=2 - -inherit eutils - -DESCRIPTION="Generic initramfs generation tool" -HOMEPAGE="http://dracut.wiki.kernel.org" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -COMMON_IUSE="bootchart btrfs debug gensplash mdraid multipath selinux syslog -uswsusp xen" -NETWORK_IUSE="iscsi nbd nfs" -DM_IUSE="crypt dmraid dmsquash-live lvm" -IUSE="${COMMON_IUSE} ${DM_IUSE} ${NETWORK_IUSE}" -RESTRICT="test" - -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 - - bootchart? ( app-benchmarks/bootchart ) - btrfs? ( sys-fs/btrfs-progs ) - crypt? ( sys-fs/cryptsetup ${DM_DEPS} ) - debug? ( dev-util/strace ) - dmraid? ( sys-fs/dmraid sys-fs/multipath-tools ${DM_DEPS} ) - dmsquash-live? ( virtual/eject ${DM_DEPS} ) - gensplash? ( media-gfx/splashutils ) - iscsi? ( sys-block/open-iscsi[utils] ${NETWORK_DEPS} ) - lvm? ( >=sys-fs/lvm2-2.02.33 ) - mdraid? ( sys-fs/mdadm ) - multipath? ( sys-fs/multipath-tools ) - nbd? ( sys-block/nbd ${NETWORK_DEPS} ) - nfs? ( net-fs/nfs-utils net-nds/rpcbind ${NETWORK_DEPS} ) - selinux? ( sys-libs/libselinux sys-libs/libsepol ) - syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) ) - uswsusp? ( sys-power/suspend ) - 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}-dm-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} ; do - ! use ${module} && rm_module ${module} - done - - ! any_module ${DM_IUSE} && rm_module 90dm - ! any_module ${NETWORK_IUSE} && 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 -} - -pkg_postinst() { - elog 'To generate the initramfs:' - elog ' # mount /boot (if necessary)' - elog ' # dracut "" ' - 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 - 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/dracut-008.ebuild b/sys-kernel/dracut/dracut-008.ebuild deleted file mode 100644 index abfb8f0fb9f1..000000000000 --- a/sys-kernel/dracut/dracut-008.ebuild +++ /dev/null @@ -1,208 +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-008.ebuild,v 1.6 2011/03/31 15:26:33 ssuominen Exp $ - -EAPI=2 - -inherit eutils - -DESCRIPTION="Generic initramfs generation tool" -HOMEPAGE="http://dracut.wiki.kernel.org" -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}" -RESTRICT="test" - -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? ( virtual/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 "" ' - 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 - ewarn 'dhcp-3 is known to not work with QEMU. You will need dhcp-4 or' - ewarn 'later for it.' - echo - elog 'Options (documented in dracut.kernel(7)) have new format since this' - elog 'version. Old format is preserved, but will be removed in future.' - elog 'Please migrate to the new one.' -} diff --git a/sys-kernel/dracut/dracut-009-r1.ebuild b/sys-kernel/dracut/dracut-009-r1.ebuild deleted file mode 100644 index c1f3ae3f8bfe..000000000000 --- a/sys-kernel/dracut/dracut-009-r1.ebuild +++ /dev/null @@ -1,213 +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-009-r1.ebuild,v 1.3 2011/06/23 10:38:17 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" -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? ( 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}-don-t-skip-zero-length-string-outfile.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 "" ' - 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-007-dm-udev-rules.patch b/sys-kernel/dracut/files/dracut-007-dm-udev-rules.patch deleted file mode 100644 index a9611d2b6268..000000000000 --- a/sys-kernel/dracut/files/dracut-007-dm-udev-rules.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 374c91e07c0996d5aacb25ba71b3aa1fcf83afec Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= -Date: Sun, 4 Jul 2010 21:21:29 +0200 -Subject: [PATCH 2/2] dm, dmraid, lvm: install udev rules file 64-device-mapper.rules - -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/install | 3 +++ - modules.d/90dmraid/install | 3 +++ - modules.d/90lvm/install | 3 +++ - 3 files changed, 9 insertions(+), 0 deletions(-) - -diff --git a/modules.d/90dm/install b/modules.d/90dm/install -index f77d945..0bc9ced 100755 ---- a/modules.d/90dm/install -+++ b/modules.d/90dm/install -@@ -7,3 +7,6 @@ inst dmsetup - - inst 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/install b/modules.d/90dmraid/install -index a016e4d..81c63f0 100755 ---- a/modules.d/90dmraid/install -+++ b/modules.d/90dmraid/install -@@ -15,6 +15,9 @@ 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/install b/modules.d/90lvm/install -index 3e20866..461d1a7 100755 ---- a/modules.d/90lvm/install -+++ b/modules.d/90lvm/install -@@ -13,6 +13,9 @@ if [[ $hostonly ]] || [[ $lvmconf = "yes" ]]; then - 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.2 - diff --git a/sys-kernel/dracut/files/dracut-007-multipath-udev-rules.patch b/sys-kernel/dracut/files/dracut-007-multipath-udev-rules.patch deleted file mode 100644 index 601569cbe683..000000000000 --- a/sys-kernel/dracut/files/dracut-007-multipath-udev-rules.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 303a1e3dc95c2c876a4e775e78482c35c0a40e20 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= -Date: Mon, 5 Jul 2010 13:09:32 +0200 -Subject: [PATCH 1/2] 90multipath: added kpartx.rules; multipath.rules - different prefix - ---- - modules.d/90multipath/install | 13 ++++++------- - 1 files changed, 6 insertions(+), 7 deletions(-) - -diff --git a/modules.d/90multipath/install b/modules.d/90multipath/install -index ed2d698..656b3fd 100755 ---- a/modules.d/90multipath/install -+++ b/modules.d/90multipath/install -@@ -6,23 +6,22 @@ else - LIBDIR="/lib" - fi - -+# Last three are for S/390 - for f in \ - /sbin/dmsetup \ - /sbin/kpartx \ - /sbin/mpath_wait \ - /sbin/multipath \ - /sbin/multipathd \ -- /sbin/xdrgetuid \ -- /sbin/xdrgetprio \ -- /etc/xdrdevices.conf \ - /etc/multipath.conf \ - /etc/multipath/wwids \ - $(ls $LIBDIR/libmultipath* $LIBDIR/multipath/* 2>/dev/null) \ -- ;do -- [ -e "$f" ] && inst "$f" -+ /sbin/xdrgetuid \ -+ /sbin/xdrgetprio \ -+ /etc/xdrdevices.conf; do -+ [ -e "$f" ] && inst "$f" - done - - 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.2 - diff --git a/sys-kernel/dracut/files/dracut-008-dm-udev-rules.patch b/sys-kernel/dracut/files/dracut-008-dm-udev-rules.patch deleted file mode 100644 index 1ca778abdd5b..000000000000 --- a/sys-kernel/dracut/files/dracut-008-dm-udev-rules.patch +++ /dev/null @@ -1,62 +0,0 @@ -From 08b94155141151123737ff72a8cdd9c818de2e68 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= -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 deleted file mode 100644 index 01de912de1d6..000000000000 --- a/sys-kernel/dracut/files/dracut-008-i18n-config-file-parsing-in-hostonly.patch +++ /dev/null @@ -1,30 +0,0 @@ -From ebaed7d51f61d331d128037e0b37130c58e957e3 Mon Sep 17 00:00:00 2001 -From: Harald Hoyer -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 deleted file mode 100644 index cce21ae2c32a..000000000000 --- a/sys-kernel/dracut/files/dracut-008-multipath-udev-rules.patch +++ /dev/null @@ -1,24 +0,0 @@ -From b9ffb4f62109670c84de6ab4ccf53c8f25c20ca3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= -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/files/dracut-009-don-t-skip-zero-length-string-outfile.patch b/sys-kernel/dracut/files/dracut-009-don-t-skip-zero-length-string-outfile.patch deleted file mode 100644 index 4deeb6b983a8..000000000000 --- a/sys-kernel/dracut/files/dracut-009-don-t-skip-zero-length-string-outfile.patch +++ /dev/null @@ -1,32 +0,0 @@ -From fcc34c5611c2a5298380c9d47e5d7883a7a6f422 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= -Date: Tue, 29 Mar 2011 00:46:31 +0200 -Subject: [PATCHv2] dracut: don't skip zero-length string outfile argument - -When '' was passed as outfile, dracut generated name with following -pattern: - - /boot/initramfs-$kernel - -With commit 486a1b9324d6fc7bc534d8147d64b8b259692c46 dracut skips '' -argument. ---- - dracut | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/dracut b/dracut -index 6b67dc0..c16b222 100755 ---- a/dracut -+++ b/dracut -@@ -237,7 +237,7 @@ while (($# > 0)); do - ;; - -*) printf "\nUnknown option: %s\n\n" "$1" >&2; usage; exit 1;; - *) -- if ! [[ $outfile ]]; then -+ if ! [[ ${outfile+x} ]]; then - outfile=$1 - elif [[ $kernel = "unset" ]]; then - kernel=$1 --- -1.7.4.1 - diff --git a/sys-kernel/dracut/files/dracut-009-multipath-udev-rules.patch b/sys-kernel/dracut/files/dracut-009-multipath-udev-rules.patch deleted file mode 100644 index 2b9cffad38c4..000000000000 --- a/sys-kernel/dracut/files/dracut-009-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?= -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/metadata.xml b/sys-kernel/dracut/metadata.xml index 5d98018cca0e..aa29f482ed3f 100644 --- a/sys-kernel/dracut/metadata.xml +++ b/sys-kernel/dracut/metadata.xml @@ -11,21 +11,7 @@ Lance Albertson - Add support for bootchart (app-benchmarks/bootchart) - Add support for root on Btrfs - Add support for encrypted partitions with cryptsetup/LUKS Module installing additional tools like strace, file editor, ssh and more - Add support for dmraid devices, also known as ATA-RAID, or Fake RAID. - Module which might be used for Live CDs - Add support for framebuffer splash at boot-time - Add support for iSCSI - Add support for the Logical Volume Manager (sys-apps/lvm2) - Add support for MD devices, also known as software RAID devices - Add support for Device Mapper multipathing - Add support for network block devices - Add support for NFS - Add support for uswsusp (sys-power/suspend) - Add support for Xen Generic, modular initramfs generation tool that can be used across various -- 2.26.2