| Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From 7ab576a7c61406b7e63739d1b11017ae336b9008 Mon Sep 17 00:00:00 2001 |
| 2 | From: Robert Yang <liezhi.yang@windriver.com> |
| 3 | Date: Mon, 3 Mar 2014 03:34:48 -0500 |
| 4 | Subject: [PATCH] grub.d/10_linux.in: add oe's kernel name |
| 5 | |
| 6 | Our kernel's name is bzImage, we need add it to grub.d/10_linux.in so |
| 7 | that the grub-mkconfig and grub-install can work correctly. |
| 8 | |
| 9 | We only need add the bzImage to util/grub.d/10_linux.in, but also add it |
| 10 | to util/grub.d/20_linux_xen.in to keep compatibility. |
| 11 | |
| 12 | Upstream-Status: Inappropriate [OE specific] |
| 13 | |
| 14 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
| 15 | --- |
| 16 | util/grub.d/10_linux.in | 4 ++-- |
| 17 | util/grub.d/20_linux_xen.in | 2 +- |
| 18 | 2 files changed, 3 insertions(+), 3 deletions(-) |
| 19 | |
| 20 | diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in |
| 21 | index 14402e8..c58f417 100644 |
| 22 | --- a/util/grub.d/10_linux.in |
| 23 | +++ b/util/grub.d/10_linux.in |
| 24 | @@ -153,11 +153,11 @@ EOF |
| 25 | machine=`uname -m` |
| 26 | case "x$machine" in |
| 27 | xi?86 | xx86_64) |
| 28 | - list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do |
| 29 | + list=`for i in /boot/bzImage-* /bzImage-* /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do |
| 30 | if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi |
| 31 | done` ;; |
| 32 | *) |
| 33 | - list=`for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do |
| 34 | + list=`for i in /boot/bzImage-* /boot/vmlinuz-* /boot/vmlinux-* /bzImage-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do |
| 35 | if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi |
| 36 | done` ;; |
| 37 | esac |
| 38 | diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in |
| 39 | index 1d94502..b2decf3 100644 |
| 40 | --- a/util/grub.d/20_linux_xen.in |
| 41 | +++ b/util/grub.d/20_linux_xen.in |
| 42 | @@ -138,7 +138,7 @@ EOF |
| 43 | EOF |
| 44 | } |
| 45 | |
| 46 | -linux_list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do |
| 47 | +linux_list=`for i in /boot/bzImage[xz]-* /bzImage[xz]-* /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do |
| 48 | if grub_file_is_not_garbage "$i"; then |
| 49 | basename=$(basename $i) |
| 50 | version=$(echo $basename | sed -e "s,^[^0-9]*-,,g") |
| 51 | -- |
| 52 | 1.7.10.4 |
| 53 | |