summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/grub
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2014-03-03 22:49:48 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-03-07 15:05:08 +0000
commit155b01057bef8a4e2a7c84bb4e505a6e42155e09 (patch)
treef1424bf4f36c046a40ac2d35aa98c002ca0d84fe /meta/recipes-bsp/grub
parentf9c7936045d40cef56c2422f6d39b55500ebabc1 (diff)
downloadpoky-155b01057bef8a4e2a7c84bb4e505a6e42155e09.tar.gz
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>
Diffstat (limited to 'meta/recipes-bsp/grub')
-rw-r--r--meta/recipes-bsp/grub/files/grub-2.00-add-oe-kernel.patch53
-rw-r--r--meta/recipes-bsp/grub/grub_2.00.bb1
2 files changed, 54 insertions, 0 deletions
diff --git a/meta/recipes-bsp/grub/files/grub-2.00-add-oe-kernel.patch b/meta/recipes-bsp/grub/files/grub-2.00-add-oe-kernel.patch
new file mode 100644
index 0000000000..eb8916cb72
--- /dev/null
+++ b/meta/recipes-bsp/grub/files/grub-2.00-add-oe-kernel.patch
@@ -0,0 +1,53 @@
1From 7ab576a7c61406b7e63739d1b11017ae336b9008 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Mon, 3 Mar 2014 03:34:48 -0500
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
12Upstream-Status: Inappropriate [OE specific]
13
14Signed-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
20diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
21index 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
38diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
39index 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--
521.7.10.4
53
diff --git a/meta/recipes-bsp/grub/grub_2.00.bb b/meta/recipes-bsp/grub/grub_2.00.bb
index ff9a7c6228..c21031bde1 100644
--- a/meta/recipes-bsp/grub/grub_2.00.bb
+++ b/meta/recipes-bsp/grub/grub_2.00.bb
@@ -22,6 +22,7 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
22 file://check-if-liblzma-is-disabled.patch \ 22 file://check-if-liblzma-is-disabled.patch \
23 file://40_custom \ 23 file://40_custom \
24 file://fix-issue-with-flex-2.5.37.patch \ 24 file://fix-issue-with-flex-2.5.37.patch \
25 file://grub-2.00-add-oe-kernel.patch \
25 " 26 "
26 27
27SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c" 28SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c"