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