diff options
| -rw-r--r-- | sys-kernel/dracut/ChangeLog | 9 | ||||
| -rw-r--r-- | sys-kernel/dracut/Manifest | 18 | ||||
| -rw-r--r-- | sys-kernel/dracut/dracut-013-r2.ebuild | 228 | ||||
| -rw-r--r-- | sys-kernel/dracut/files/dracut-013-makefile-manpages.patch | 33 |
4 files changed, 280 insertions, 8 deletions
diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog index 0b19ac0a89a1..14fdc5924fac 100644 --- a/sys-kernel/dracut/ChangeLog +++ b/sys-kernel/dracut/ChangeLog @@ -1,6 +1,13 @@ # 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.33 2011/09/09 20:54:53 aidecoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.34 2011/11/16 14:27:32 aidecoe Exp $ + +*dracut-013-r2 (16 Nov 2011) + + 16 Nov 2011; Amadeusz Żołnowski <aidecoe@gentoo.org> +dracut-013-r2.ebuild, + +files/dracut-013-makefile-manpages.patch: + Patched Makefile to install man pages properly. Fixes bug #390629. Btw, use + single call to epatch. 09 Sep 2011; Amadeusz Żołnowski <aidecoe@gentoo.org> dracut-010-r3.ebuild, dracut-011.ebuild, dracut-011-r1.ebuild, dracut-013.ebuild, diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest index f3ab5d8036a4..fb0c7a95686c 100644 --- a/sys-kernel/dracut/Manifest +++ b/sys-kernel/dracut/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +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 @@ -9,6 +9,7 @@ AUX dracut-011-integrated-initramfs-fix.patch 800 RMD160 a870763a3c4c5a9acdafea5 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 @@ -17,15 +18,18 @@ EBUILD dracut-010-r3.ebuild 6065 RMD160 09bf1d01e9dcf45059056ef340448bf397e25704 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 10292 RMD160 5bd5606303874fe3996706ce2ddf5b04cd3fe3b1 SHA1 e41776d02b2400401f3eb0f9b8a01082204e78c1 SHA256 ae6f2b7f0cfc6e45edee91e2afce198a8ae74c20e892d5baf25ba35138ab8cb7 +MISC ChangeLog 10551 RMD160 43c030f34e86bf72730b7f013ba116b890b1f2d1 SHA1 fcfd45166b3820d01af1e5ddf2a2ea4ec8087802 SHA256 7acd16507ddb228a262c51504f5e6c950e216469af301083ba2c519ae59f2bfe MISC metadata.xml 602 RMD160 cd11704bfcf7aca599c2671b91416112fdb2cc75 SHA1 d2345b2bb4d17a6887754a7569d7d91f32f42df2 SHA256 c234e9242c61200d81fe2ba3b58deaab911bc36413d657a61580ca6de69f2412 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iJwEAQEIAAYFAk59tEMACgkQfXuS5UK5QB1gewP9HSSsntv0NBapCu0jV+2DUdNJ -iV6bgdOdnaJ+TX0WGdLSN3XSYWldURGk7Sz30fSP02spnqeIp0XKEI8nv6YHaKj1 -9guA8uDNywOcDp7relgWURzDzIccJOS+11pO0p/UerYXWBoepG+2vygwN9juHLjl -U3+kWGSrFMY6m6JhBV8= -=gI6h +iQEcBAEBAgAGBQJOw8haAAoJEPATRTHh2/q10gAH/3w2N7lTClptw2UaSO4RjmW/ +LkahhpEkOKFWzI5/60ZGAEiUX/cyBSN33d4nkAM/8QO7ZfCDSKO3m6uhxIa8P/Va +kikv4fz+GhrEmXgjlIaue6tT12JCj4N7w0XOB0Mm4RpnCNkd5CP1OpBc7YUK5HvE +h+56kkCSe3PTrwA9EG2sjKNrDEAbbfPR3XN+sufQ+4eIq2E4wlv20BTFdPoyXttp +yWH1gdcZ1fZR5zrpiyzsvT2wRasof76Mp5aVhqMMlAlrWTRsphC4ZnNZpI+pRHVy +jglWBEG96OoYvrCBbuWQiB0bEpliOLUBSksR7uvpraPZ7iu5UtRd0h2T3cz2A2Y= +=zV01 -----END PGP SIGNATURE----- diff --git a/sys-kernel/dracut/dracut-013-r2.ebuild b/sys-kernel/dracut/dracut-013-r2.ebuild new file mode 100644 index 000000000000..5a7710f047a8 --- /dev/null +++ b/sys-kernel/dracut/dracut-013-r2.ebuild @@ -0,0 +1,228 @@ +# 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-013-r2.ebuild,v 1.1 2011/11/16 14:27:32 aidecoe Exp $ + +EAPI=4 + +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" +REQUIRED_USE="dracut_modules_livenet? ( dracut_modules_dmsquash-live ) + dracut_modules_crypt-gpg? ( dracut_modules_crypt ) + " + +BASIC_MODULES=" + " +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_livenet + dracut_modules_nbd + dracut_modules_nfs + " +DM_MODULES=" + dracut_modules_crypt + dracut_modules_dmraid + dracut_modules_dmsquash-live + dracut_modules_livenet + dracut_modules_lvm + " +IUSE_DRACUT_MODULES="${COMMON_MODULES} ${DM_MODULES} ${NETWORK_MODULES}" +IUSE="debug selinux ${IUSE_DRACUT_MODULES}" +RESTRICT="test" + +NETWORK_DEPS=">=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.8 + >=sys-apps/sysvinit-2.87-r3 + >=sys-apps/util-linux-2.16 + >=sys-fs/udev-164 + 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? ( ${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" \ + "${FILESDIR}/${P}-livenet-gentoo-ca-bundle-path.patch" \ + "${FILESDIR}/${P}-integrated-initramfs-fix.patch" \ + "${FILESDIR}/${P}-makefile-manpages.patch" +} + +src_compile() { + emake WITH_SWITCH_ROOT=0 +} + +src_install() { + emake WITH_SWITCH_ROOT=0 \ + prefix=/usr 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 + + # + # 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 95fcoe # no tools + # fips module depends on masked app-crypt/hmaccalc + rm_module 01fips + + # Remove extra modules which go to future dracut-extras + rm_module 00bootchart 05busybox 97masterkey 98ecryptfs 98integrity +} + +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.' + echo + elog 'Some dependencies were removed, because they are optional. dracut' + elog "will inform you with a warning when you're lacking something optional." +} diff --git a/sys-kernel/dracut/files/dracut-013-makefile-manpages.patch b/sys-kernel/dracut/files/dracut-013-makefile-manpages.patch new file mode 100644 index 000000000000..d55802eb357f --- /dev/null +++ b/sys-kernel/dracut/files/dracut-013-makefile-manpages.patch @@ -0,0 +1,33 @@ +From 2cc392f32c86b1a603d4b07ea20e25e209113e47 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name> +Date: Wed, 16 Nov 2011 15:16:07 +0100 +Subject: [PATCH] Makefile: Append target files names for man pages. + +--- + Makefile | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/Makefile b/Makefile +index 80173a3..454cd8e 100644 +--- a/Makefile ++++ b/Makefile +@@ -40,11 +40,11 @@ install: doc + install -m 0755 dracut-functions $(DESTDIR)$(pkglibdir)/dracut-functions + install -m 0755 dracut-logger $(DESTDIR)$(pkglibdir)/dracut-logger + cp -arx modules.d $(DESTDIR)$(pkglibdir) +- install -m 0644 dracut.8 $(DESTDIR)$(mandir)/man8 +- install -m 0644 dracut-catimages.8 $(DESTDIR)$(mandir)/man8 +- install -m 0644 dracut-gencmdline.8 $(DESTDIR)$(mandir)/man8 +- install -m 0644 dracut.conf.5 $(DESTDIR)$(mandir)/man5 +- install -m 0644 dracut.kernel.7 $(DESTDIR)$(mandir)/man7 ++ install -m 0644 dracut.8 $(DESTDIR)$(mandir)/man8/dracut.8 ++ install -m 0644 dracut-catimages.8 $(DESTDIR)$(mandir)/man8/dracut-catimages.8 ++ install -m 0644 dracut-gencmdline.8 $(DESTDIR)$(mandir)/man8/dracut-gencmdline.8 ++ install -m 0644 dracut.conf.5 $(DESTDIR)$(mandir)/man5/dracut.conf.5 ++ install -m 0644 dracut.kernel.7 $(DESTDIR)$(mandir)/man7/dracut.kernel.7 + + clean: + $(RM) *~ +-- +1.7.8.rc1 + |