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