summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAmadeusz Piotr Żołnowski <aidecoe@gentoo.org>2012-08-04 11:13:35 +0000
committerAmadeusz Piotr Żołnowski <aidecoe@gentoo.org>2012-08-04 11:13:35 +0000
commite402f9114352bd95a80c87b56e01b4a22c10425c (patch)
tree4c9017747c49fba2325386c39ab578fd958da17a /sys-kernel
parentUnmask net-misc/curl USE=metalink again (bug #429334). (diff)
downloadgentoo-2-e402f9114352bd95a80c87b56e01b4a22c10425c.tar.gz
gentoo-2-e402f9114352bd95a80c87b56e01b4a22c10425c.tar.bz2
gentoo-2-e402f9114352bd95a80c87b56e01b4a22c10425c.zip
Remove old revisions of 019 and 022.
(Portage version: 2.1.11.9/cvs/Linux x86_64)
Diffstat (limited to 'sys-kernel')
-rw-r--r--sys-kernel/dracut/ChangeLog6
-rw-r--r--sys-kernel/dracut/dracut-019-r4.ebuild253
-rw-r--r--sys-kernel/dracut/dracut-022-r3.ebuild268
3 files changed, 5 insertions, 522 deletions
diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog
index 3db087d069bd..a722ccc289ff 100644
--- a/sys-kernel/dracut/ChangeLog
+++ b/sys-kernel/dracut/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for sys-kernel/dracut
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.79 2012/08/04 10:43:05 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.80 2012/08/04 11:13:35 aidecoe Exp $
+
+ 04 Aug 2012; Amadeusz Żołnowski <aidecoe@gentoo.org> -dracut-019-r4.ebuild,
+ -dracut-022-r3.ebuild:
+ Remove old revisions of 019 and 022.
*dracut-022-r4 (04 Aug 2012)
*dracut-019-r5 (04 Aug 2012)
diff --git a/sys-kernel/dracut/dracut-019-r4.ebuild b/sys-kernel/dracut/dracut-019-r4.ebuild
deleted file mode 100644
index d92c21995df1..000000000000
--- a/sys-kernel/dracut/dracut-019-r4.ebuild
+++ /dev/null
@@ -1,253 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-019-r4.ebuild,v 1.1 2012/07/31 16:52:23 aidecoe Exp $
-
-EAPI=4
-
-inherit eutils linux-info
-
-add_req_use_for() {
- local dep="$1"; shift
- local f
-
- for f in "$@"; do
- REQUIRED_USE+="${f}? ( ${dep} )
-"
- done
-}
-
-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="~amd64 ~x86"
-
-REQUIRED_USE="dracut_modules_crypt-gpg? ( dracut_modules_crypt )
- dracut_modules_livenet? ( dracut_modules_dmsquash-live )
- "
-COMMON_MODULES="
- dracut_modules_biosdevname
- dracut_modules_bootchart
- 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
- "
-DM_MODULES="
- dracut_modules_crypt
- dracut_modules_dmraid
- dracut_modules_dmsquash-live
- dracut_modules_livenet
- dracut_modules_lvm
- "
-NETWORK_MODULES="
- dracut_modules_iscsi
- dracut_modules_livenet
- dracut_modules_nbd
- dracut_modules_nfs
- dracut_modules_ssh-client
- "
-add_req_use_for device-mapper ${DM_MODULES}
-add_req_use_for net ${NETWORK_MODULES}
-IUSE_DRACUT_MODULES="${COMMON_MODULES} ${DM_MODULES} ${NETWORK_MODULES}"
-IUSE="debug device-mapper net selinux ${IUSE_DRACUT_MODULES}"
-
-RESTRICT="test"
-
-RDEPEND="
- app-arch/cpio
- >=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/kmod-5[tools] )
- >=sys-apps/sysvinit-2.87-r3
- >=sys-apps/util-linux-2.20
- >=sys-fs/udev-166
-
- debug? ( dev-util/strace )
- device-mapper? ( || ( sys-fs/device-mapper >=sys-fs/lvm2-2.02.33 ) )
- net? ( net-misc/curl >=net-misc/dhcp-4.2.1-r1 sys-apps/iproute2 )
- selinux? ( sys-libs/libselinux sys-libs/libsepol )
- dracut_modules_biosdevname? ( sys-apps/biosdevname )
- dracut_modules_bootchart? ( app-benchmarks/bootchart2 )
- dracut_modules_btrfs? ( sys-fs/btrfs-progs )
- dracut_modules_caps? ( sys-libs/libcap )
- dracut_modules_crypt? ( sys-fs/cryptsetup )
- dracut_modules_crypt-gpg? ( app-crypt/gnupg )
- dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools )
- dracut_modules_gensplash? ( media-gfx/splashutils )
- dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 )
- 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 )
- dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind )
- dracut_modules_plymouth? ( >=sys-boot/plymouth-0.8.3-r1 )
- dracut_modules_ssh-client? ( dev-libs/openssl )
- dracut_modules_syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) )
- "
-DEPEND=""
-
-#
-# 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 force m
- [[ $1 = -f ]] && force=-f
-
- for m in $@; do
- if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then
- rm ${force} --interactive=never -r "${modules_dir}"/$m
- else
- rm ${force} --interactive=never -r "${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}/${PV}-0001-90multipath-added-kpartx.rules-multipa.patch"
- epatch "${FILESDIR}/${PV}-0002-Avoid-annonying-warnings-when-pkg-conf.patch"
- epatch "${FILESDIR}/${PV}-0003-99shutdown-remove-no-wall-argument-for.patch"
- epatch "${FILESDIR}/${PV}-0004-dracut.sh-do-not-copy-var-run-and-var-.patch"
- epatch "${FILESDIR}/${PV}-0005-dracut.sh-create-relative-symlinks-for.patch"
-}
-
-src_compile() {
- return
-}
-
-src_install() {
- emake prefix=/usr libdir="/usr/$(get_libdir)" sysconfdir=/etc \
- DESTDIR="${D}" install
-
- local gen2conf
-
- dodir /var/lib/dracut/overlay
- dodoc HACKING TODO AUTHORS NEWS README*
-
- case "$(base_sys_maj_ver)" in
- 1) gen2conf=gentoo.conf ;;
- 2) gen2conf=gentoo-openrc.conf ;;
- *) die "Expected ver. 1 or 2 of Gentoo Base System (/etc/gentoo-release)."
- esac
-
- insinto /etc/dracut.conf.d
- newins dracut.conf.d/${gen2conf}.example ${gen2conf}
-
- insinto /etc/logrotate.d
- newins dracut.logrotate dracut
-
- dohtml dracut.html
-
- #
- # Modules
- #
- local module
- modules_dir="${D}/usr/$(get_libdir)/dracut/modules.d"
-
- # Remove modules not enabled by USE flags
- for module in ${IUSE_DRACUT_MODULES} ; do
- ! use ${module} && rm_module -f ${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
-
- # Following flags define set of helper modules which are base dependencies
- # for others and as so have no practical use, so remove these modules.
- use device-mapper || rm_module 90dm
- use net || rm_module 40network 45ifcfg 45url-lib
-
- # Remove S/390 modules which are not tested at all
- rm_module 80cms 95dasd 95dasd_mod 95zfcp 95znet
-
- # Remove modules which won't work for sure
- rm_module 95fcoe # no tools
- # fips module depends on masked app-crypt/hmaccalc
- rm_module 01fips 02fips-aesni
-
- # Remove extra modules which go to future dracut-extras
- rm_module 05busybox 97masterkey 98ecryptfs 98integrity 98systemd
-}
-
-pkg_postinst() {
- if linux-info_get_any_version && linux_config_src_exists; then
- echo
- ewarn "If the following test report contains a missing kernel"
- ewarn "configuration option, you should reconfigure and rebuild your"
- ewarn "kernel before booting image generated with this Dracut version."
- echo
-
- local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS ~MODULES"
-
- # Kernel configuration options descriptions:
- local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev"
- local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\
-"(initramfs/initrd) support"
- local desc_MODULES="Enable loadable module support"
-
- local opt desc
-
- # Generate ERROR_* variables for check_extra_config.
- for opt in ${CONFIG_CHECK}; do
- opt=${opt#\~}
- desc=desc_${opt}
- eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \
- "is missing and REQUIRED'"
- done
-
- check_extra_config
- echo
- else
- echo
- ewarn "Your kernel configuration couldn't be checked. Do you have"
- ewarn "/usr/src/linux/.config file there? Please check manually if"
- ewarn "following options are enabled:"
- ewarn ""
- ewarn " CONFIG_BLK_DEV_INITRD"
- ewarn " CONFIG_DEVTMPFS"
- ewarn " CONFIG_MODULES"
- echo
- fi
-}
diff --git a/sys-kernel/dracut/dracut-022-r3.ebuild b/sys-kernel/dracut/dracut-022-r3.ebuild
deleted file mode 100644
index 969282941574..000000000000
--- a/sys-kernel/dracut/dracut-022-r3.ebuild
+++ /dev/null
@@ -1,268 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-022-r3.ebuild,v 1.1 2012/07/31 16:52:23 aidecoe Exp $
-
-EAPI=4
-
-inherit eutils linux-info toolchain-funcs
-
-add_req_use_for() {
- local dep="$1"; shift
- local f
-
- for f in "$@"; do
- REQUIRED_USE+="${f}? ( ${dep} )
-"
- done
-}
-
-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="~amd64 ~x86"
-
-REQUIRED_USE="dracut_modules_crypt-gpg? ( dracut_modules_crypt )
- dracut_modules_livenet? ( dracut_modules_dmsquash-live )
- "
-COMMON_MODULES="
- dracut_modules_biosdevname
- dracut_modules_bootchart
- 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
- "
-DM_MODULES="
- dracut_modules_crypt
- dracut_modules_dmraid
- dracut_modules_dmsquash-live
- dracut_modules_livenet
- dracut_modules_lvm
- "
-NETWORK_MODULES="
- dracut_modules_iscsi
- dracut_modules_livenet
- dracut_modules_nbd
- dracut_modules_nfs
- dracut_modules_ssh-client
- "
-add_req_use_for device-mapper ${DM_MODULES}
-add_req_use_for net ${NETWORK_MODULES}
-IUSE_DRACUT_MODULES="${COMMON_MODULES} ${DM_MODULES} ${NETWORK_MODULES}"
-IUSE="debug device-mapper optimization net selinux ${IUSE_DRACUT_MODULES}"
-
-RESTRICT="test"
-
-RDEPEND="
- app-arch/cpio
- >=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/kmod-5[tools] )
- >=sys-apps/sysvinit-2.87-r3
- >=sys-apps/util-linux-2.20
- >=sys-fs/udev-166
-
- debug? ( dev-util/strace )
- device-mapper? ( || ( sys-fs/device-mapper >=sys-fs/lvm2-2.02.33 ) )
- net? ( net-misc/curl >=net-misc/dhcp-4.2.1-r1 sys-apps/iproute2 )
- selinux? ( sys-libs/libselinux sys-libs/libsepol )
- dracut_modules_biosdevname? ( sys-apps/biosdevname )
- dracut_modules_bootchart? ( app-benchmarks/bootchart2 )
- dracut_modules_btrfs? ( sys-fs/btrfs-progs )
- dracut_modules_caps? ( sys-libs/libcap )
- dracut_modules_crypt? ( sys-fs/cryptsetup )
- dracut_modules_crypt-gpg? ( app-crypt/gnupg )
- dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools )
- dracut_modules_gensplash? ( media-gfx/splashutils )
- dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 )
- 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 )
- dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind )
- dracut_modules_plymouth? ( >=sys-boot/plymouth-0.8.3-r1 )
- dracut_modules_ssh-client? ( dev-libs/openssl )
- dracut_modules_syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) )
- "
-DEPEND="
- app-text/asciidoc
- >=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 force m
- [[ $1 = -f ]] && force=-f
-
- for m in $@; do
- if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then
- rm ${force} --interactive=never -r "${modules_dir}"/$m
- else
- rm ${force} --interactive=never -r "${modules_dir}"/[0-9][0-9]$m
- fi
- done
-}
-
-#
-# ebuild functions
-#
-
-src_prepare() {
- epatch "${FILESDIR}/${PV}-0001-qemu-module-setup.sh-provide-alternati.patch"
- epatch "${FILESDIR}/${PV}-0002-Makefile-use-implicit-rules-for-instal.patch"
- epatch "${FILESDIR}/${PV}-0003-kernel-modules-module-setup.sh-just-op.patch"
- epatch "${FILESDIR}/${PV}-0004-90multipath-added-kpartx.rules-multipa.patch"
- epatch "${FILESDIR}/${PV}-0005-gentoo.conf-set-udevdir.patch"
- epatch "${FILESDIR}/${PV}-0006-Config-file-for-systemd-on-Gentoo.patch"
- epatch "${FILESDIR}/${PV}-0007-Remove-obsolete-gentoo-conf-file.patch"
- epatch "${FILESDIR}/${PV}-0008-95rootfs-block-fix-left-fsck-rel.-chec.patch"
- epatch "${FILESDIR}/${PV}-0009-98usrmount-use-rw-and-ro-options-inste.patch"
- epatch "${FILESDIR}/${PV}-0010-98usrmount-print-mount-options.patch"
- epatch "${FILESDIR}/${PV}-0011-dracut-lib-new-functions-listlist-and-.patch"
- epatch "${FILESDIR}/${PV}-0012-apply-ro-and-rw-options-from-cmdline-t.patch"
- epatch "${FILESDIR}/${PV}-0013-ro_mnt-option-at-build-time-to-force-r.patch"
- epatch "${FILESDIR}/${PV}-0014-parse-root-opts-first-check-for-ro-lat.patch"
- epatch "${FILESDIR}/${PV}-0015-gentoo.conf-enable-ro_mnt.patch"
- epatch "${FILESDIR}/${PV}-0016-dracut.sh-test-if-we-can-lazy-resolve-.patch"
- epatch "${FILESDIR}/${PV}-0017-99shutdown-remove-no-wall-argument-for.patch"
- epatch "${FILESDIR}/${PV}-0018-dracut.sh-do-not-copy-var-run-and-var-.patch"
- epatch "${FILESDIR}/${PV}-0019-dracut.sh-create-relative-symlinks-for.patch"
- einfo "Removing ${S}/install/hashmap.o ..."
- rm "${S}/install/hashmap.o" || die
-}
-
-src_compile() {
- if use optimization; then
- ewarn "Enabling experimental optimization!"
- tc-export CC
- emake prefix=/usr sysconfdir=/etc DESTDIR="${D}" doc \
- install/dracut-install
- fi
-}
-
-src_install() {
- emake prefix=/usr libdir="/usr/$(get_libdir)" sysconfdir=/etc \
- DESTDIR="${D}" install
-
- dodir /var/lib/dracut/overlay
- dodoc HACKING TODO AUTHORS NEWS README*
-
- insinto /etc/dracut.conf.d
- newins dracut.conf.d/gentoo.conf.example gentoo.conf
-
- insinto /etc/logrotate.d
- newins dracut.logrotate dracut
-
- dohtml dracut.html
-
- #
- # Modules
- #
- local module
- modules_dir="${D}/usr/$(get_libdir)/dracut/modules.d"
-
- # Remove modules not enabled by USE flags
- for module in ${IUSE_DRACUT_MODULES} ; do
- ! use ${module} && rm_module -f ${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
-
- # Following flags define set of helper modules which are base dependencies
- # for others and as so have no practical use, so remove these modules.
- use device-mapper || rm_module 90dm
- use net || rm_module 40network 45ifcfg 45url-lib
-
- # Remove S/390 modules which are not tested at all
- rm_module 80cms 95dasd 95dasd_mod 95zfcp 95znet
-
- # Remove modules which won't work for sure
- rm_module 95fcoe # no tools
- # fips module depends on masked app-crypt/hmaccalc
- rm_module 01fips 02fips-aesni
-
- # Remove extra modules which go to future dracut-extras
- rm_module 05busybox 97masterkey 98ecryptfs 98integrity 98systemd
-}
-
-pkg_postinst() {
- if linux-info_get_any_version && linux_config_src_exists; then
- ewarn ""
- ewarn "If the following test report contains a missing kernel"
- ewarn "configuration option, you should reconfigure and rebuild your"
- ewarn "kernel before booting image generated with this Dracut version."
- ewarn ""
-
- local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS ~MODULES"
-
- # Kernel configuration options descriptions:
- local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev"
- local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\
-"(initramfs/initrd) support"
- local desc_MODULES="Enable loadable module support"
-
- local opt desc
-
- # Generate ERROR_* variables for check_extra_config.
- for opt in ${CONFIG_CHECK}; do
- opt=${opt#\~}
- desc=desc_${opt}
- eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \
- "is missing and REQUIRED'"
- done
-
- check_extra_config
- echo
- else
- ewarn ""
- ewarn "Your kernel configuration couldn't be checked. Do you have"
- ewarn "/usr/src/linux/.config file there? Please check manually if"
- ewarn "following options are enabled:"
- ewarn ""
- ewarn " CONFIG_BLK_DEV_INITRD"
- ewarn " CONFIG_DEVTMPFS"
- ewarn " CONFIG_MODULES"
- ewarn ""
- fi
-
- if has_version virtual/pkgconfig; then
- elog ""
- elog "virtual/pkgconfig is no longer needed by dracut."
- elog ""
- fi
-}