diff options
author | Amadeusz Żołnowski <aidecoe@gentoo.org> | 2012-06-09 13:16:12 +0000 |
---|---|---|
committer | Amadeusz Żołnowski <aidecoe@gentoo.org> | 2012-06-09 13:16:12 +0000 |
commit | 83ceb3667ca0365c7869613e2a027953248d1373 (patch) | |
tree | 8e83f421098f9bd6b8a27dc820360fc9a80965c4 /sys-kernel | |
parent | Remove buggy versions, bug #420005 (diff) | |
download | historical-83ceb3667ca0365c7869613e2a027953248d1373.tar.gz historical-83ceb3667ca0365c7869613e2a027953248d1373.tar.bz2 historical-83ceb3667ca0365c7869613e2a027953248d1373.zip |
Version bump.
NEWS
~~~~
- initqueue/online hook
- fixes for ifcfg write out
- rootfs-block: avoid remount when options don't change
- virtfs root filesystem support
- cope with systemd-udevd
- mount tmpfs with strictatime
- include all kernel/drivers/net/phy drivers
- add debug_on() and debug_off() functions
- add arguments for source_hook() and source_all()
- cleanup hook
- plymouth: get consoledev from /sys/class/tty/console/active
- install xhci-hcd kernel module
- dracut: new "--mount" option
- lsinitrd: new option --printsize
- ARM storage kernel modules added
- /etc/initrd-release in the initrd
- vlan support
- full bonding and bridge support
- removed scsi_wait_scan kernel module from standard install
- support rd.luks.allow-discards and honor options in crypttab
- lots of bugfixes
Package-Manager: portage-2.1.10.65/cvs/Linux x86_64
Diffstat (limited to 'sys-kernel')
-rw-r--r-- | sys-kernel/dracut/ChangeLog | 32 | ||||
-rw-r--r-- | sys-kernel/dracut/Manifest | 19 | ||||
-rw-r--r-- | sys-kernel/dracut/dracut-019.ebuild | 261 | ||||
-rw-r--r-- | sys-kernel/dracut/files/dracut-019-multipath-udev-rules.patch | 25 |
4 files changed, 328 insertions, 9 deletions
diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog index 09e1f0bf9486..fa811a2b3172 100644 --- a/sys-kernel/dracut/ChangeLog +++ b/sys-kernel/dracut/ChangeLog @@ -1,6 +1,36 @@ # 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.62 2012/05/18 08:12:04 aidecoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.63 2012/06/09 13:16:12 aidecoe Exp $ + +*dracut-019 (09 Jun 2012) + + 09 Jun 2012; Amadeusz Żołnowski <aidecoe@gentoo.org> +dracut-019.ebuild, + +files/dracut-019-multipath-udev-rules.patch: + Version bump. + + NEWS + ~~~~ + - initqueue/online hook + - fixes for ifcfg write out + - rootfs-block: avoid remount when options don't change + - virtfs root filesystem support + - cope with systemd-udevd + - mount tmpfs with strictatime + - include all kernel/drivers/net/phy drivers + - add debug_on() and debug_off() functions + - add arguments for source_hook() and source_all() + - cleanup hook + - plymouth: get consoledev from /sys/class/tty/console/active + - install xhci-hcd kernel module + - dracut: new "--mount" option + - lsinitrd: new option --printsize + - ARM storage kernel modules added + - /etc/initrd-release in the initrd + - vlan support + - full bonding and bridge support + - removed scsi_wait_scan kernel module from standard install + - support rd.luks.allow-discards and honor options in crypttab + - lots of bugfixes 18 May 2012; Amadeusz Żołnowski <aidecoe@gentoo.org> dracut-018-r1.ebuild: Added 'bootchart' module. diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest index 62386e57bb58..7e8291fa9066 100644 --- a/sys-kernel/dracut/Manifest +++ b/sys-kernel/dracut/Manifest @@ -5,21 +5,24 @@ AUX dracut-014-multipath-udev-rules.patch 848 RMD160 99527326b1c5c33647a750d4bba AUX dracut-014-usrmount-fsck-fix.patch 1208 RMD160 0247c724be5e130e23d89cdfc387612de5fee3f4 SHA1 65d74c80b2ed702a6cf073f0eff819bd6df022b9 SHA256 192ed24457c07d282cbdc75576d6bfc272572c482d28188c34a48c613a5b1565 AUX dracut-018-lsinitrd-support-symlinks.patch 699 RMD160 fd399d2bdeef80b09500e58933b2ebfe2add9a9a SHA1 62913d739d7431990290a13e68c087a3e52f3298 SHA256 b2d422b0a026265101045b641a2b4cef20e0ca15ca3e6fce8616d721b334ea2f AUX dracut-018-multipath-udev-rules.patch 848 RMD160 99527326b1c5c33647a750d4bba2da9b6b5f0c92 SHA1 353c065322645f063fd3ae90ece7635eab8225ed SHA256 0e2215897b7cbac1bf9c84b42d6eb8af4438674934749bc339f768cba6662c18 +AUX dracut-019-multipath-udev-rules.patch 846 RMD160 155eb13f8a417ac142c8dd298530040d2c2ad20a SHA1 c31b6ad88efeb95740e5f15f5c50205057440cb7 SHA256 bea1932312f071e30b7887fa281ab5cd524c446f2e45c8a62432c7db5da5e1e1 DIST dracut-014.tar.bz2 155914 RMD160 bc20154b11f2924fe971f3fecb13ce18630adac5 SHA1 8a041beb9d1ca2b8fcc94c7619fd6b6093f02577 SHA256 1b81a71d121fa4e268bab098daadabb3077ecde7573b5726fe35591347fdd2e3 DIST dracut-018.tar.bz2 189067 RMD160 52aac6e60525ff4f54b8483f9a7694365792d710 SHA1 70ba92d32e44d34701eff53bc78c5b05fe97a5f8 SHA256 3ebc0e9c9df24802dd4061aea6907670453fc865257885abfd9166af5caccb42 +DIST dracut-019.tar.bz2 199187 RMD160 eaaef42c1e4039a95004ecc2490e673f2fb2271b SHA1 b69e0d96d0bfdb768830edb1e97b834119c92319 SHA256 a68f00f896aef1cdebc8479f522d6a10b9d20b7dfcdaca85168d54dcf3891da7 EBUILD dracut-014-r2.ebuild 6209 RMD160 86d5c2619aa7ab3b0a100711d840be3f2f784f84 SHA1 eb37b4d8ef907cf7733d4f581dc1ffd42cd291ef SHA256 b35e3e732bbb9a155357d62473d20e035f139708b2bd79077e1b6cfee63439d6 EBUILD dracut-018-r1.ebuild 7308 RMD160 ed29dbf31fdae5ebff2d59607cbce2c22eb347fd SHA1 bd8eb2be3020447408821c7e793989fe5d0249cf SHA256 07206d0f0ff41cf6286c576e32a59a5c5c4c093a537bbd09a6262148181e43ad EBUILD dracut-018.ebuild 7175 RMD160 5d073f8a8a47fcaab65b3ef3d7246b842183def6 SHA1 0d65aa2701fe18d2a18ace228aad2b2f7907a271 SHA256 b4f1aaf03b6f83bc9b0d0ee04014f0b25f622e3482d578db6cc380f7b421dc03 -MISC ChangeLog 21515 RMD160 130cf28c3f6881aced12f1ca7ee994229ec67029 SHA1 f7fd87b9c4552b9f539046ee094993661b6e09b9 SHA256 b4bc6dc23fe309dcc5a2dabf9e25e220286e7e8a4e0335e379cb867e637a9fa3 +EBUILD dracut-019.ebuild 7159 RMD160 86ba485f0a00fca3803c9e742a2067153d58ac4c SHA1 5ee6e11186fa4e4fb69af80ed41c3df3d47e1d13 SHA256 29d900e018434150d68a26ed75c3d36cbd69ba3b4035b5eabe6e3fb170a6def6 +MISC ChangeLog 22538 RMD160 c684d357e40e9a07e65f681efa913b273d7b8180 SHA1 2982be79c9f2d6e3feffb986607ec248f79c104e SHA256 34b79f722eea4156929ba594bb877efd369e2d7646c7b9252abc584970d62938 MISC metadata.xml 780 RMD160 469db92ed19d7fe7adeb606b7095ad4ad9ca51e1 SHA1 1c85da433a13323e257ccdc6ed27d623149ad2b7 SHA256 ec8bfdca230f0f9f4b33b7e08c9f3978ac812396f4e6b07c1e96e3320e9d03fd -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBAgAGBQJPtgRaAAoJEPATRTHh2/q1WN8IAJI2anWq100ThtfMZ2xn2DGN -qT2yCok9cARztCEvv07jI8NMcRHQThk0ZnMYnZ/i4XSBWEFO6SnM43FM8qFYdRe7 -dced7EBBsN+n8CbfKOkhNfVwlLDO0d/LAxk025OUsvsDkMfxaKzumw2An3dBluFc -ISJc6EOemuYP+/bp/pe6JWR3Sz7arnItscFDZpcUYQMV7ddgFrJE40tupJXMlX0h -h1PBevxUoKS0FjHRx+HfYAnf6Kw+2xfK4c0rXA0AVZAa+AS7rjBF2KbqqTmnzj5I -ACvc33QHoEediAfg674IA23C7qg2Uhmc18R+H6otsz6lK86NrPywdVhT02F1to8= -=Oyo2 +iQEcBAEBAgAGBQJP00yiAAoJEPATRTHh2/q1JScIAJcox8QiVVH/zPCDeUUeH/9f ++eyS9Uui8voQDpW+KHeAfZN46pyJG8tuX4Wnfx9N3923vM6KyYhQgu3XC6wSO8Id +4Qtee4NM2Cl2RNripxbpx9KLrW4ZNLQo1/6/LoER3leEZqJAjhNbKHeEt4ExycXv +PQOez6XuzoUZpyP18X2RPUqco61awx2fwHjHV3Spu0DWAjmmGSZTcDKlJOtWi59q +EJPydWc7zt32An7cDi8qFoV0dmUp76IAY0Ae/wEnw6QpCE3bwdDEAHLjKHLjYzIH +UtM1v7drnyOx3oB4AlepezpEyE7p91/Izzm/XlqMJ6kuFirnFPDwPuUUyIrkXL4= +=Vow9 -----END PGP SIGNATURE----- diff --git a/sys-kernel/dracut/dracut-019.ebuild b/sys-kernel/dracut/dracut-019.ebuild new file mode 100644 index 000000000000..60b10fc18934 --- /dev/null +++ b/sys-kernel/dracut/dracut-019.ebuild @@ -0,0 +1,261 @@ +# 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.ebuild,v 1.1 2012/06/09 13:16:12 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-shells/bash-4.0 + >=app-shells/dash-0.5.4.11 + >=sys-apps/baselayout-1.12.14-r1 + >=sys-apps/sysvinit-2.87-r3 + >=sys-apps/util-linux-2.20 + >=sys-fs/udev-164 + app-arch/cpio + || ( >=sys-apps/module-init-tools-3.8 >sys-apps/kmod-5[tools] ) + + 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}/${P}-multipath-udev-rules.patch" +} + +src_compile() { + return +} + +src_install() { + emake 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 + + dohtml dracut.html + + # + # Modules + # + local module + modules_dir="${D}/usr/lib/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 + + 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 'To include only dracut modules and kernel drivers for this system,' + elog 'use the "-H" option. Some modules need to be explicitly added with' + elog '"-a" option even if required tools are installed.' +} diff --git a/sys-kernel/dracut/files/dracut-019-multipath-udev-rules.patch b/sys-kernel/dracut/files/dracut-019-multipath-udev-rules.patch new file mode 100644 index 000000000000..8268189ce58a --- /dev/null +++ b/sys-kernel/dracut/files/dracut-019-multipath-udev-rules.patch @@ -0,0 +1,25 @@ +From 6b237d3517701c96b852d00682d48548b56a97d2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name> +Date: Sat, 9 Jun 2012 14:18:56 +0200 +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 bf71fdc..67d6068 100755 +--- a/modules.d/90multipath/module-setup.sh ++++ b/modules.d/90multipath/module-setup.sh +@@ -72,6 +72,6 @@ install() { + + inst_hook pre-trigger 02 "$moddir/multipathd.sh" + inst_hook cleanup 02 "$moddir/multipathd-stop.sh" +- inst_rules 40-multipath.rules ++ inst_rules 40-multipath.rules 65-multipath.rules 66-kpartx.rules + } + +-- +1.7.8.6 + |