mirror of
https://git.yoctoproject.org/poky
synced 2026-06-04 02:00:04 +00:00
grub 2.00: add oe's kernel name to the conf file
Our kernel's name is bzImage, we need add it to grub.d/10_linux.in so that the grub-mkconfig and grub-install can work correctly on the target. (From OE-Core rev: c972e122066aa80550155feea619908f6d3c3176) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
f9c7936045
commit
155b01057b
@@ -0,0 +1,53 @@
|
|||||||
|
From 7ab576a7c61406b7e63739d1b11017ae336b9008 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Robert Yang <liezhi.yang@windriver.com>
|
||||||
|
Date: Mon, 3 Mar 2014 03:34:48 -0500
|
||||||
|
Subject: [PATCH] grub.d/10_linux.in: add oe's kernel name
|
||||||
|
|
||||||
|
Our kernel's name is bzImage, we need add it to grub.d/10_linux.in so
|
||||||
|
that the grub-mkconfig and grub-install can work correctly.
|
||||||
|
|
||||||
|
We only need add the bzImage to util/grub.d/10_linux.in, but also add it
|
||||||
|
to util/grub.d/20_linux_xen.in to keep compatibility.
|
||||||
|
|
||||||
|
Upstream-Status: Inappropriate [OE specific]
|
||||||
|
|
||||||
|
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
|
||||||
|
---
|
||||||
|
util/grub.d/10_linux.in | 4 ++--
|
||||||
|
util/grub.d/20_linux_xen.in | 2 +-
|
||||||
|
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
|
||||||
|
index 14402e8..c58f417 100644
|
||||||
|
--- a/util/grub.d/10_linux.in
|
||||||
|
+++ b/util/grub.d/10_linux.in
|
||||||
|
@@ -153,11 +153,11 @@ EOF
|
||||||
|
machine=`uname -m`
|
||||||
|
case "x$machine" in
|
||||||
|
xi?86 | xx86_64)
|
||||||
|
- list=`for i in /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do
|
||||||
|
+ list=`for i in /boot/bzImage-* /bzImage-* /boot/vmlinuz-* /vmlinuz-* /boot/kernel-* ; do
|
||||||
|
if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
|
||||||
|
done` ;;
|
||||||
|
*)
|
||||||
|
- list=`for i in /boot/vmlinuz-* /boot/vmlinux-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do
|
||||||
|
+ list=`for i in /boot/bzImage-* /boot/vmlinuz-* /boot/vmlinux-* /bzImage-* /vmlinuz-* /vmlinux-* /boot/kernel-* ; do
|
||||||
|
if grub_file_is_not_garbage "$i" ; then echo -n "$i " ; fi
|
||||||
|
done` ;;
|
||||||
|
esac
|
||||||
|
diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
|
||||||
|
index 1d94502..b2decf3 100644
|
||||||
|
--- a/util/grub.d/20_linux_xen.in
|
||||||
|
+++ b/util/grub.d/20_linux_xen.in
|
||||||
|
@@ -138,7 +138,7 @@ EOF
|
||||||
|
EOF
|
||||||
|
}
|
||||||
|
|
||||||
|
-linux_list=`for i in /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do
|
||||||
|
+linux_list=`for i in /boot/bzImage[xz]-* /bzImage[xz]-* /boot/vmlinu[xz]-* /vmlinu[xz]-* /boot/kernel-*; do
|
||||||
|
if grub_file_is_not_garbage "$i"; then
|
||||||
|
basename=$(basename $i)
|
||||||
|
version=$(echo $basename | sed -e "s,^[^0-9]*-,,g")
|
||||||
|
--
|
||||||
|
1.7.10.4
|
||||||
|
|
||||||
@@ -22,6 +22,7 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
|
|||||||
file://check-if-liblzma-is-disabled.patch \
|
file://check-if-liblzma-is-disabled.patch \
|
||||||
file://40_custom \
|
file://40_custom \
|
||||||
file://fix-issue-with-flex-2.5.37.patch \
|
file://fix-issue-with-flex-2.5.37.patch \
|
||||||
|
file://grub-2.00-add-oe-kernel.patch \
|
||||||
"
|
"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c"
|
SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c"
|
||||||
|
|||||||
Reference in New Issue
Block a user