From 4c151f237c6342c1370fbe8575f4cc836c578ea7 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Amadeusz=20=C5=BBo=C5=82nowski?= Date: Tue, 27 Dec 2011 14:01:05 +0000 Subject: [PATCH] sys-kernel/dracut: Version bump to 014. Package-Manager: portage-2.1.10.43/cvs/Linux x86_64 --- sys-kernel/dracut/ChangeLog | 52 +++- sys-kernel/dracut/Manifest | 19 +- sys-kernel/dracut/dracut-014.ebuild | 225 ++++++++++++++++++ .../dracut-014-multipath-udev-rules.patch | 24 ++ 4 files changed, 311 insertions(+), 9 deletions(-) create mode 100644 sys-kernel/dracut/dracut-014.ebuild create mode 100644 sys-kernel/dracut/files/dracut-014-multipath-udev-rules.patch diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog index 216ba92875a3..64e35bdccfc2 100644 --- a/sys-kernel/dracut/ChangeLog +++ b/sys-kernel/dracut/ChangeLog @@ -1,6 +1,56 @@ # 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.35 2011/11/16 14:32:29 aidecoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.36 2011/12/27 14:01:05 aidecoe Exp $ + +*dracut-014 (27 Dec 2011) + + 27 Dec 2011; Amadeusz Żołnowski +dracut-014.ebuild, + +files/dracut-014-multipath-udev-rules.patch: + Version bump. + + This version provides new modules: + - usrmount + - securityfs + + Following modules were removed: + - xen + + + NEWS + ~~~~ + From Dracut NEWS file: + + - new dracut arguments: + --lvmconf + --nolvmconf + --fscks [LIST] + --nofscks + - new .conf options: + install_items + fscks + nofscks + - new kernel options: + rd.md.ddf + rd.md.waitclean + plymouth.enable + - dracut move from /sbin to /usr/bin + - dracut modules dir moved from /usr/share/dracut to /usr/lib/dracut + - profiling with "dracut --profile" + - speedup of initramfs creation + - ask_for_password fallback to CLI + - mdraid completely switched to incremental assembly + - no more cdrom polling + - "switch_root" breakpoint is now very late + - /dev/live is gone + - /dev/root is gone + - fs-lib dracut module for fscks added + - usb mass storage kernel drivers now included + - usrmount dracut module added: + mount /usr if found in /sysroot/etc/fstab + - only include fsck helper needed for hostonly + - support iSCSI drivers: qla4xxx, cxgb3i, cxgb4i, bnx2i, be2iscsi + - add install_items to dracut.conf + install_items+=" [ ...] " 16 Nov 2011; Amadeusz Żołnowski -dracut-010-r3.ebuild, -files/dracut-010-empty-etc-ld.so.conf.d.patch, diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest index c7cd0e912a87..be5c02447211 100644 --- a/sys-kernel/dracut/Manifest +++ b/sys-kernel/dracut/Manifest @@ -5,20 +5,23 @@ AUX dracut-013-integrated-initramfs-fix.patch 800 RMD160 a870763a3c4c5a9acdafea5 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 +AUX dracut-014-multipath-udev-rules.patch 848 RMD160 99527326b1c5c33647a750d4bba2da9b6b5f0c92 SHA1 353c065322645f063fd3ae90ece7635eab8225ed SHA256 0e2215897b7cbac1bf9c84b42d6eb8af4438674934749bc339f768cba6662c18 DIST dracut-013.tar.bz2 149337 RMD160 0d0eb8a84ea0cd208afe433f28e49bfb0b423209 SHA1 1e1c7fd6f7919399fb20f25f662d0529b61f4078 SHA256 5e63cd711f28e13088a095186095e1af2561be422d1e5d0e4ab351205010c717 +DIST dracut-014.tar.bz2 155914 RMD160 bc20154b11f2924fe971f3fecb13ce18630adac5 SHA1 8a041beb9d1ca2b8fcc94c7619fd6b6093f02577 SHA256 1b81a71d121fa4e268bab098daadabb3077ecde7573b5726fe35591347fdd2e3 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 11017 RMD160 2fb8ba391f2ffe56cbb703b909c3596e32d3f3f5 SHA1 c9a012ca8aee527db7d73a02b502430e7cdc26ad SHA256 d3aef552c886da45ff604cb58e5a4e646bbca7d106d1dac164fee33735c93b51 +EBUILD dracut-014.ebuild 6206 RMD160 bd5ca8713c14b35e9be3a32be29fa02f9f2c6eaa SHA1 b2e493046af9428d51f4920557fb3b4691a8b38d SHA256 acb17702431698ea16c09dfcbed6a778d82fedc55a008f94e536b7144b5d29b9 +MISC ChangeLog 12324 RMD160 9d15399ae6a324b77f120dec7006a24f7ff45e22 SHA1 98d1eca8cb376c423101c0d81f541453000e0b57 SHA256 b8330318286666995889e25a7affe0d16a0bc6802bc66d5c8323585bef1d6db3 MISC metadata.xml 602 RMD160 cd11704bfcf7aca599c2671b91416112fdb2cc75 SHA1 d2345b2bb4d17a6887754a7569d7d91f32f42df2 SHA256 c234e9242c61200d81fe2ba3b58deaab911bc36413d657a61580ca6de69f2412 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBAgAGBQJOw8mCAAoJEPATRTHh2/q1Zu4H/2gPjE5C4caSvz7c9Q6dyjGg -524+a7nErm4RFELkOZlxY/7Lr9zEkv4JRKt0NhZHVO9r4a8VlCK2fOCILLU77eLk -fps518C8HD1hDcw/40O+rGfkVBzkQkeTOHX6XD2sKXckKggBtoAKfnw16Rz/nZ0Q -Y/2T2BvEz1Vksg+b39ae9rTp/HBYcQv3bU6eH4w0qt5Go9gxCznNSzeR1L8q6U42 -vXce/lnmb+TdtjEy3MxQ0u+vHqsyKja4Hi38YfkOBa/Nu4sJuf8liLAsT0+PzMLh -doElDA2OT2T2ahtFYfUTtCLgMWfvchIbeWG4uhofsFWTY7MI5ib4IPudLcXRw7o= -=9MgW +iQEcBAEBAgAGBQJO+c+nAAoJEPATRTHh2/q1jOIIAIYB3N1uZNf1LDbNBDcUgO49 +9FZnWn8UfsoQjX9dzENZmy9/lWuIZL+YmoMhIV67p/Hakr7g9ulCcN64Vf1MJypv +uxqaWXA9VhpuvDKitbfAlNVEBZmuvsoG1wUtFWAZ6RZx6qmxRxxk/kc8WwbXlxAu +qR9vkgn6xLUB/et1GG+WaVkR9SxPWof2vvRsDVNcuOMXMRCEnk8nP2bJUbQOmXVT +PBMulsbq1+PMHQ7lggbdM6LH3Hwxwebp85lgMIvXW1pJ/dn1/WvfVPUEl0YBsFCp +zj2UvSyCgrXcxV3gpr29gZS4uQ0vuvFdUvKIA34FirVys1eoXA6UAoiJ5YBDCGc= +=vie4 -----END PGP SIGNATURE----- diff --git a/sys-kernel/dracut/dracut-014.ebuild b/sys-kernel/dracut/dracut-014.ebuild new file mode 100644 index 000000000000..6fda156b6c67 --- /dev/null +++ b/sys-kernel/dracut/dracut-014.ebuild @@ -0,0 +1,225 @@ +# 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-014.ebuild,v 1.1 2011/12/27 14:01:05 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" +} + +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/lib/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 02fips-aesni + + # 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 "" ' + 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-014-multipath-udev-rules.patch b/sys-kernel/dracut/files/dracut-014-multipath-udev-rules.patch new file mode 100644 index 000000000000..2b9cffad38c4 --- /dev/null +++ b/sys-kernel/dracut/files/dracut-014-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?= +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 + -- 2.26.2