diff options
author | Amadeusz Żołnowski <aidecoe@gentoo.org> | 2011-04-01 14:59:53 +0000 |
---|---|---|
committer | Amadeusz Żołnowski <aidecoe@gentoo.org> | 2011-04-01 14:59:53 +0000 |
commit | ab8fc525ba9418efc8fab23f8921c4eee43a342f (patch) | |
tree | 272a003d35410902dd723d2813898757e9541bda /sys-kernel/dracut | |
parent | Fixed CFLAGS pollution (-g), bug #361449 thank Agostino Sarubbo (amd64 AT) fo... (diff) | |
download | historical-ab8fc525ba9418efc8fab23f8921c4eee43a342f.tar.gz historical-ab8fc525ba9418efc8fab23f8921c4eee43a342f.tar.bz2 historical-ab8fc525ba9418efc8fab23f8921c4eee43a342f.zip |
sys-kernel/dracut: Version bump to 010. No, it's not a joke.
It's generally a bugfix release.
Package-Manager: portage-2.1.9.45/cvs/Linux x86_64
Diffstat (limited to 'sys-kernel/dracut')
-rw-r--r-- | sys-kernel/dracut/ChangeLog | 8 | ||||
-rw-r--r-- | sys-kernel/dracut/Manifest | 17 | ||||
-rw-r--r-- | sys-kernel/dracut/dracut-010.ebuild | 211 | ||||
-rw-r--r-- | sys-kernel/dracut/files/dracut-010-multipath-udev-rules.patch | 24 |
4 files changed, 254 insertions, 6 deletions
diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog index c2537be9119d..48fe29f5be00 100644 --- a/sys-kernel/dracut/ChangeLog +++ b/sys-kernel/dracut/ChangeLog @@ -1,6 +1,12 @@ # 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.20 2011/03/31 15:26:33 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.21 2011/04/01 14:59:53 aidecoe Exp $ + +*dracut-010 (01 Apr 2011) + + 01 Apr 2011; Amadeusz Żołnowski <aidecoe@gentoo.org> +dracut-010.ebuild, + +files/dracut-010-multipath-udev-rules.patch: + Version bump. No, it's not a joke. It's generally a bugfix release. 31 Mar 2011; Samuli Suominen <ssuominen@gentoo.org> dracut-007.ebuild, dracut-008.ebuild, dracut-008-r1.ebuild, dracut-009-r1.ebuild: diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest index 4178ccca49a6..9f908a78a65b 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-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 @@ -8,19 +8,26 @@ AUX dracut-008-i18n-config-file-parsing-in-hostonly.patch 966 RMD160 3d37f7f3009 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-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 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 5912 RMD160 6d0ca0bb0989d42700ecec4b2fea91be914861ff SHA1 121a9ea5bc03967b149b734db9de945c6213ca1c SHA256 620196708d1c6df83de5a433354c3c34062e031f9d06dba56887441b40b800a4 -MISC ChangeLog 6539 RMD160 b858c824806285223ca7edaa5fb9ccd6870d966b SHA1 bb3249440c1c3016ed9f2eff894d56fc37e8264b SHA256 75d3d728cda8a5a0e4e48a342ee2ad5c1f111fda4abbe02c12f51cceb268ff55 +EBUILD dracut-010.ebuild 5837 RMD160 0df9dcc9b017147358ec343a8b07cd0b37246a6f SHA1 a6b652811c1b934b77a9794d1958439b1fab4069 SHA256 8350ce428a0d97f983eb138f543917eb4776a220e0ab6c8ccb1f91d879b4197e +MISC ChangeLog 6760 RMD160 e50d22491c1938d3560ff964edd5a876863aafa6 SHA1 19d86224ff02a6498a43a07bcd23661de0ed2cd7 SHA256 8f4908d4a18d6010479d7630ea967a71373b9c4712d2db8ced277969a425c351 MISC metadata.xml 1725 RMD160 39ad0c0c425b5422045655565f4fb4ac0b466ae8 SHA1 cf1a5835711f3cf7b5b25a49dc046d9493f1c6ea SHA256 572c681c3a7996183b74fe19a6da477dccc4184c6f0d0e7c0608f6909611048a -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk2UnVkACgkQXkR9YqOcLPFR7gD7BuIPu5Dtq+lFI2bSWmskYhGp -FdEoPfR/izzHs2WKTEEBAJXnDp121am3a/bOkdDMPgx6bUDpkNZLe7cWnHlPyvQA -=bDAW +iQEcBAEBAgAGBQJNlehvAAoJEPATRTHh2/q1WmsH/AsqI4PUl10W9jBeYoopclE+ +bqlbxVcwcwZ2CC/nJyZDAmx0KVLDje9wDEpuBUHXnVCycXSxkxjY2g5ENNOOVMN5 +uQQewPwo//JQL149K6t34Sdwoaxv3MsIWp2CBU+bxW61tfGDbi2FLUDIyb0EGXXr +SE/f91D6tJF5hYRlobVOWTRpT9dRzPVUOs90CALQsbC1Tpf7SC5pqFD+yvphIM1F +QV176NOI6yOk/mjvipwRJS8CRUzrp+/1LkJZiOerhev5DXl9OkgH2uKelsh4lWOE +ellM40lLk/3ykZbaaEsgTVFLbvGpKIQ4Oh76lrWxPBJzVNsSZf8nb7jQbOCCBPE= +=dUQd -----END PGP SIGNATURE----- diff --git a/sys-kernel/dracut/dracut-010.ebuild b/sys-kernel/dracut/dracut-010.ebuild new file mode 100644 index 000000000000..321f820e95b8 --- /dev/null +++ b/sys-kernel/dracut/dracut-010.ebuild @@ -0,0 +1,211 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-010.ebuild,v 1.1 2011/04/01 14:59:53 aidecoe Exp $ + +EAPI=2 + +inherit eutils + +DESCRIPTION="Generic initramfs generation tool" +HOMEPAGE="http://dracut.wiki.kernel.org" +SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~x86 ~amd64" + +COMMON_MODULES=" + dracut_modules_biosdevname + dracut_modules_btrfs + dracut_modules_caps + dracut_modules_gensplash + dracut_modules_mdraid + dracut_modules_multipath + dracut_modules_plymouth + dracut_modules_syslog + dracut_modules_xen + " +NETWORK_MODULES=" + dracut_modules_iscsi + dracut_modules_nbd + dracut_modules_nfs + " +DM_MODULES=" + dracut_modules_crypt + dracut_modules_dmraid + dracut_modules_dmsquash-live + dracut_modules_lvm + " +IUSE_DRACUT_MODULES="${COMMON_MODULES} ${DM_MODULES} ${NETWORK_MODULES}" +IUSE="debug selinux ${IUSE_DRACUT_MODULES}" + +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? ( sys-apps/eject ${DM_DEPS} ) + dracut_modules_gensplash? ( media-gfx/splashutils ) + dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 ${NETWORK_DEPS} ) + dracut_modules_lvm? ( >=sys-fs/lvm2-2.02.33 ) + dracut_modules_mdraid? ( sys-fs/mdadm ) + dracut_modules_multipath? ( sys-fs/multipath-tools ) + dracut_modules_nbd? ( sys-block/nbd ${NETWORK_DEPS} ) + dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind ${NETWORK_DEPS} ) + dracut_modules_plymouth? ( >=sys-boot/plymouth-0.8.3-r1 ) + dracut_modules_syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) ) + dracut_modules_xen? ( app-emulation/xen ) + " +DEPEND=" + >=dev-libs/libxslt-1.1.26 + app-text/docbook-xml-dtd:4.5 + >=app-text/docbook-xsl-stylesheets-1.75.2 + " + +# +# Helper functions +# + +# Returns true if any of specified modules is enabled by USE flag and false +# otherwise. +# $1 = list of modules (which have corresponding USE flags of the same name) +any_module() { + local m modules=" $@ " + + for m in ${modules}; do + ! use $m && modules=${modules/ $m / } + done + + shopt -s extglob + modules=${modules%%+( )} + shopt -u extglob + + [[ ${modules} ]] +} + +# Removes module from modules.d. +# $1 = module name +# Module name can be specified without number prefix. +rm_module() { + local m + + for m in $@; do + if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then + rm -rf "${modules_dir}"/$m + else + rm -rf "${modules_dir}"/[0-9][0-9]$m + fi + done +} + +# Displays Gentoo Base System major release number +base_sys_maj_ver() { + local line + + read line < /etc/gentoo-release + line=${line##* } + echo "${line%%.*}" +} + +# +# ebuild functions +# + +src_prepare() { + epatch "${FILESDIR}/${P}-multipath-udev-rules.patch" +} + +src_compile() { + emake WITH_SWITCH_ROOT=0 || die "emake failed" +} + +src_install() { + emake WITH_SWITCH_ROOT=0 \ + prefix=/usr sysconfdir=/etc DESTDIR="${D}" \ + install || die "emake install failed" + + local gen2conf + + dodir /var/lib/dracut/overlay + dodoc HACKING TODO AUTHORS NEWS README* || die 'dodoc failed' + + case "$(base_sys_maj_ver)" in + 1) gen2conf=gentoo.conf ;; + 2) gen2conf=gentoo-openrc.conf ;; + *) die "Expected ver. 1 or 2 of Gentoo Base System (/etc/gentoo-release)." + esac + + insinto /etc/dracut.conf.d + newins dracut.conf.d/${gen2conf}.example ${gen2conf} \ + || die 'gen2conf ins failed' + + insinto /etc/logrotate.d + newins dracut.logrotate dracut || die 'dracut.logrotate ins failed' + + # + # Modules + # + local module + modules_dir="${D}/usr/share/dracut/modules.d" + + echo "${PF}" > "${modules_dir}"/10rpmversion/dracut-version \ + || die 'dracut-version failed' + + # Remove modules not enabled by USE flags + for module in ${IUSE_DRACUT_MODULES} ; do + ! use ${module} && rm_module ${module#dracut_modules_} + done + + # Those flags are specific, and even are corresponding to modules, they need + # to be declared as regular USE flags. + use debug || rm_module 95debug + use selinux || rm_module 98selinux + + ! any_module ${DM_MODULES} && rm_module 90dm + ! any_module ${NETWORK_MODULES} && rm_module 45ifcfg 40network + + # Remove S/390 modules which are not tested at all + rm_module 95dasd 95dasd_mod 95zfcp 95znet + + # Remove modules which won't work for sure + rm_module 00bootchart 05busybox # broken + rm_module 95fcoe # no tools + + # fips module depends on masked app-crypt/hmaccalc + rm_module 01fips +} + +pkg_postinst() { + elog 'To generate the initramfs:' + elog ' # mount /boot (if necessary)' + elog ' # dracut "" <kernel-version>' + elog '' + elog 'For command line documentation see dracut.kernel(7).' + elog '' + elog 'Simple example to select root and resume partition:' + elog ' root=/dev/sda1 resume=/dev/sda2' + elog '' + elog 'The default config (in /etc/dracut.conf) is very minimal and is highly' + elog 'recommended you adjust based on your needs. To include only dracut' + elog 'modules and kernel drivers for this system, use the "-H" option.' + elog 'Some modules need to be explicitly added with "-a" option even if' + elog 'required tools are installed.' + echo + elog 'Options (documented in dracut.kernel(7)) have new format since' + elog 'version 008. Old format is preserved, but will be removed in future.' + elog 'Please migrate to the new one.' +} diff --git a/sys-kernel/dracut/files/dracut-010-multipath-udev-rules.patch b/sys-kernel/dracut/files/dracut-010-multipath-udev-rules.patch new file mode 100644 index 000000000000..2b9cffad38c4 --- /dev/null +++ b/sys-kernel/dracut/files/dracut-010-multipath-udev-rules.patch @@ -0,0 +1,24 @@ +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 + |