diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2012-04-11 19:49:27 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2012-04-11 19:49:27 +0000 |
| commit | 298c5383ca8da071de55272d0962af1ef53bfb56 (patch) | |
| tree | a51995f2704322fd1a626f450373004f78c870b1 /sys-boot | |
| parent | Fix a resolver assert triggered by recent hwids/usbutils changes (diff) | |
| download | gentoo-2-298c5383ca8da071de55272d0962af1ef53bfb56.tar.gz gentoo-2-298c5383ca8da071de55272d0962af1ef53bfb56.tar.bz2 gentoo-2-298c5383ca8da071de55272d0962af1ef53bfb56.zip | |
Adjust patch to use uname -m in place of a shell glob.
(Portage version: 2.2.0_alpha100/cvs/Linux x86_64)
Diffstat (limited to 'sys-boot')
| -rw-r--r-- | sys-boot/grub/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-boot/grub/files/grub-2.00-10_linux-genkernel.patch | 49 |
2 files changed, 37 insertions, 18 deletions
diff --git a/sys-boot/grub/ChangeLog b/sys-boot/grub/ChangeLog index c966a2580992..9a83845e894d 100644 --- a/sys-boot/grub/ChangeLog +++ b/sys-boot/grub/ChangeLog @@ -1,6 +1,10 @@ # 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.197 2012/04/11 02:41:33 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-boot/grub/ChangeLog,v 1.198 2012/04/11 19:49:27 floppym Exp $ + + 11 Apr 2012; Mike Gilbert <floppym@gentoo.org> + files/grub-2.00-10_linux-genkernel.patch: + Adjust patch to use uname -m in place of a shell glob. 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 92cd72a98107..d2f55761a1b2 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,26 +1,41 @@ ---- util/grub.d/10_linux.in -+++ util/grub.d/10_linux.in -@@ -182,17 +182,19 @@ - linux_root_device_thisversion="${LINUX_ROOT_DEVICE}" +=== 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 +@@ -150,7 +150,8 @@ + EOF + } - initrd= -+ pushd "${dirname}" > /dev/null - for i in "initrd.img-${version}" "initrd-${version}.img" "initrd-${version}.gz" \ +-case x`uname -m` in ++machine=`uname -m` ++case "x$machine" in + 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 @@ + done` ;; + esac + ++if test "x${GENKERNEL_ARCH-unset}" = xunset; then ++ case "$machine" in ++ i?86) GENKERNEL_ARCH="x86" ;; ++ mips|mips64) GENKERNEL_ARCH="mips" ;; ++ arm*) GENKERNEL_ARCH="arm" ;; ++ *) GENKERNEL_ARCH="$machine" ;; ++ esac ++fi ++ + prepare_boot_cache= + prepare_root_cache= + boot_device_id= +@@ -186,8 +196,8 @@ "initrd-${version}" "initramfs-${version}.img" \ "initrd.img-${alt_version}" "initrd-${alt_version}.img" \ "initrd-${alt_version}" "initramfs-${alt_version}.img" \ - "initramfs-genkernel-${version}" \ - "initramfs-genkernel-${alt_version}"; do -- if test -e "${dirname}/${i}" ; then -+ "initramfs-genkernel"*"-${version}" \ -+ "initramfs-genkernel"*"-${alt_version}"; do -+ if test -e "${i}" ; then ++ "initramfs-genkernel-${GENKERNEL_ARCH}-${version}" \ ++ "initramfs-genkernel-${GENKERNEL_ARCH}-${alt_version}"; do + if test -e "${dirname}/${i}" ; then initrd="$i" break - fi - done -+ popd > /dev/null - - config= - for i in "${dirname}/config-${version}" "${dirname}/config-${alt_version}" "/etc/kernels/kernel-config-${version}" ; do |