| Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 1 | From b512c77222a8b133d7dd71a0dcef081a921d97d4 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Wed, 13 Jan 2016 19:28:00 +0000 |
| 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 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> |
| 13 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 14 | --- |
| 15 | Upstream-Status: Inappropriate [OE specific] |
| 16 | |
| 17 | util/grub.d/10_linux.in | 6 +++--- |
| 18 | util/grub.d/20_linux_xen.in | 2 +- |
| 19 | 2 files changed, 4 insertions(+), 4 deletions(-) |
| 20 | |
| 21 | diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in |
| 22 | index 859b608..946be5d 100644 |
| 23 | --- a/util/grub.d/10_linux.in |
| 24 | +++ b/util/grub.d/10_linux.in |
| 25 | @@ -148,12 +148,12 @@ machine=`uname -m` |
| 26 | case "x$machine" in |
| 27 | xi?86 | xx86_64) |
| 28 | list= |
| 29 | - for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do |
| 30 | + for i in /boot/bzImage-* /bzImage-* /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do |
| 31 | if grub_file_is_not_garbage "$i" ; then list="$list $i" ; fi |
| 32 | done ;; |
| 33 | - *) |
| 34 | + *) |
| 35 | list= |
| 36 | - for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do |
| 37 | + for i in /boot/bzImage-* /boot/vmlinuz-* /boot/vmlinux-* /bzImage-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do |
| 38 | if grub_file_is_not_garbage "$i" ; then list="$list $i" ; fi |
| 39 | done ;; |
| 40 | esac |
| 41 | diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in |
| 42 | index f532fb9..1994244 100644 |
| 43 | --- a/util/grub.d/20_linux_xen.in |
| 44 | +++ b/util/grub.d/20_linux_xen.in |
| 45 | @@ -138,7 +138,7 @@ EOF |
| 46 | } |
| 47 | |
| 48 | linux_list= |
| 49 | -for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do |
| 50 | +for i in /boot/bzImage[xz]-* /bzImage[xz]-* /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do |
| 51 | if grub_file_is_not_garbage "$i"; then |
| 52 | basename=$(basename $i) |
| 53 | version=$(echo $basename | sed -e "s,^[^0-9]*-,,g") |
| 54 | -- |
| 55 | 2.7.0 |
| 56 | |