summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmadeusz Piotr Żołnowski <aidecoe@gentoo.org>2011-08-31 13:05:42 +0000
committerAmadeusz Piotr Żołnowski <aidecoe@gentoo.org>2011-08-31 13:05:42 +0000
commit2b5d8ca033f3401126770fe11341ad1bdba1663d (patch)
treea8e1fe293d623cdbeb71cae043de024248fc1d8c /sys-kernel/dracut
parentChange version scheme (diff)
downloadgentoo-2-2b5d8ca033f3401126770fe11341ad1bdba1663d.tar.gz
gentoo-2-2b5d8ca033f3401126770fe11341ad1bdba1663d.tar.bz2
gentoo-2-2b5d8ca033f3401126770fe11341ad1bdba1663d.zip
sys-kernel/dracut: Removed older ebuilds (<010) and patches.
(Portage version: 2.1.10.11/cvs/Linux x86_64)
Diffstat (limited to 'sys-kernel/dracut')
-rw-r--r--sys-kernel/dracut/ChangeLog13
-rw-r--r--sys-kernel/dracut/dracut-007.ebuild183
-rw-r--r--sys-kernel/dracut/dracut-008.ebuild208
-rw-r--r--sys-kernel/dracut/dracut-009-r1.ebuild213
-rw-r--r--sys-kernel/dracut/files/dracut-007-dm-udev-rules.patch60
-rw-r--r--sys-kernel/dracut/files/dracut-007-multipath-udev-rules.patch46
-rw-r--r--sys-kernel/dracut/files/dracut-008-dm-udev-rules.patch62
-rw-r--r--sys-kernel/dracut/files/dracut-008-i18n-config-file-parsing-in-hostonly.patch30
-rw-r--r--sys-kernel/dracut/files/dracut-008-multipath-udev-rules.patch24
-rw-r--r--sys-kernel/dracut/files/dracut-009-don-t-skip-zero-length-string-outfile.patch32
-rw-r--r--sys-kernel/dracut/files/dracut-009-multipath-udev-rules.patch24
-rw-r--r--sys-kernel/dracut/metadata.xml14
12 files changed, 12 insertions, 897 deletions
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 <aidecoe@gentoo.org> -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 <aidecoe@gentoo.org> dracut-013.ebuild:
Added 'crypt' requirement for 'crypt-gpg'.
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 "" <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
- 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 "" <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
- 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 "" <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-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?= <aidecoe@aidecoe.name>
-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?= <aidecoe@aidecoe.name>
-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?= <aidecoe@aidecoe.name>
-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 <harald@redhat.com>
-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?= <aidecoe@aidecoe.name>
-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?= <aidecoe@aidecoe.name>
-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?= <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/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 @@
<name>Lance Albertson</name>
</maintainer>
<use>
- <flag name="bootchart">Add support for bootchart (app-benchmarks/bootchart)</flag>
- <flag name="btrfs">Add support for root on Btrfs</flag>
- <flag name="crypt">Add support for encrypted partitions with cryptsetup/LUKS</flag>
<flag name="debug">Module installing additional tools like strace, file editor, ssh and more</flag>
- <flag name="dmraid">Add support for dmraid devices, also known as ATA-RAID, or Fake RAID.</flag>
- <flag name="dmsquash-live">Module which might be used for Live CDs</flag>
- <flag name="gensplash">Add support for framebuffer splash at boot-time</flag>
- <flag name="iscsi">Add support for iSCSI</flag>
- <flag name="lvm">Add support for the Logical Volume Manager (sys-apps/lvm2)</flag>
- <flag name="mdraid">Add support for MD devices, also known as software RAID devices</flag>
- <flag name="multipath">Add support for Device Mapper multipathing</flag>
- <flag name="nbd">Add support for network block devices</flag>
- <flag name="nfs">Add support for NFS</flag>
- <flag name="uswsusp">Add support for uswsusp (sys-power/suspend)</flag>
- <flag name="xen">Add support for Xen</flag>
</use>
<longdescription lang="en">
Generic, modular initramfs generation tool that can be used across various