diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2012-04-26 00:08:28 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2012-04-26 00:08:28 +0000 |
| commit | 3dfa3a55add729748c52b7dd8d5d32ad4e7ddb0c (patch) | |
| tree | 6d56f72a9a4d98f26bfebd4b9994e65e195d5e8a /sys-boot | |
| parent | Fix DESCRIPTION. (diff) | |
| download | gentoo-2-3dfa3a55add729748c52b7dd8d5d32ad4e7ddb0c.tar.gz gentoo-2-3dfa3a55add729748c52b7dd8d5d32ad4e7ddb0c.tar.bz2 gentoo-2-3dfa3a55add729748c52b7dd8d5d32ad4e7ddb0c.zip | |
Replace 10_linux patch with the changeset from upstream.
(Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
Diffstat (limited to 'sys-boot')
| -rw-r--r-- | sys-boot/grub/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch | 20 | ||||
| -rw-r--r-- | sys-boot/grub/grub-2.00_beta3-r2.ebuild (renamed from sys-boot/grub/grub-2.00_beta3-r1.ebuild) | 2 |
3 files changed, 17 insertions, 13 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog index 9a83845e894d..f6be54f29f8a 100644 --- a/sys-boot/grub/ChangeLog +++ b/sys-boot/grub/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-boot/grub # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.198 2012/04/11 19:49:27 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.199 2012/04/26 00:08:27 floppym Exp $ + +*grub-2.00_beta3-r2 (26 Apr 2012) + + 26 Apr 2012; Mike Gilbert <floppym@gentoo.org> +grub-2.00_beta3-r2.ebuild, + -grub-2.00_beta3-r1.ebuild, files/grub-2.00-10_linux-genkernel.patch: + Replace 10_linux patch with the changeset from upstream. 11 Apr 2012; Mike Gilbert <floppym@gentoo.org> files/grub-2.00-10_linux-genkernel.patch: diff --git a/sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch b/sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch index d2f55761a1b2..590c6958cf2b 100644 --- a/sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch +++ b/sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch @@ -1,6 +1,5 @@ -=== modified file 'util/grub.d/10_linux.in' ---- util/grub.d/10_linux.in 2012-03-10 14:21:25 +0000 -+++ util/grub.d/10_linux.in 2012-04-11 19:26:45 +0000 +--- util/grub.d/10_linux.in ++++ util/grub.d/10_linux.in @@ -150,7 +150,8 @@ EOF } @@ -11,28 +10,27 @@ xi?86 | xx86_64) list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi -@@ -161,6 +162,15 @@ +@@ -161,6 +162,14 @@ done` ;; esac -+if test "x${GENKERNEL_ARCH-unset}" = xunset; then -+ case "$machine" in ++case "$machine" in + i?86) GENKERNEL_ARCH="x86" ;; + mips|mips64) GENKERNEL_ARCH="mips" ;; ++ mipsel|mips64el) GENKERNEL_ARCH="mipsel" ;; + arm*) GENKERNEL_ARCH="arm" ;; + *) GENKERNEL_ARCH="$machine" ;; -+ esac -+fi ++esac + prepare_boot_cache= prepare_root_cache= boot_device_id= -@@ -186,8 +196,8 @@ - "initrd-${version}" "initramfs-${version}.img" \ +@@ -187,7 +196,9 @@ "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ "initrd-${alt_version}" "initramfs-${alt_version}.img" \ -- "initramfs-genkernel-${version}" \ + "initramfs-genkernel-${version}" \ - "initramfs-genkernel-${alt_version}"; do ++ "initramfs-genkernel-${alt_version}" \ + "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \ + "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do if test -e "${dirname}/${i}" ; then diff --git a/sys-boot/grub/grub-2.00_beta3-r1.ebuild b/sys-boot/grub/grub-2.00_beta3-r2.ebuild index cc440f0b832b..b9711ad418f5 100644 --- a/sys-boot/grub/grub-2.00_beta3-r1.ebuild +++ b/sys-boot/grub/grub-2.00_beta3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00_beta3-r1.ebuild,v 1.1 2012/04/07 21:33:13 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/grub-2.00_beta3-r2.ebuild,v 1.1 2012/04/26 00:08:27 floppym Exp $ EAPI=4 |