[PATCH 0/3] grub: add oe's kernel name to the conf file

[PATCH 0/3] grub: add oe's kernel name to the conf file

[Robert Yang]

The following changes since commit 54c2e993ec129563c7ae9f3fdee74ab60da28698:

  bsps: update H/W reference boards to v3.10.32 (2014-03-02 17:25:30 +0000)

are available in the git repository at:

  git://git.pokylinux.org/poky-contrib rbt/grub
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=rbt/grub

Robert Yang (3):
  grub 2.00: add oe's kernel name to the conf file
  grub git: add oe's kernel name to the conf file
  grub-efi: add oe's kernel name to the conf file

 .../grub/files/grub-2.00-add-oe-kernel.patch       | 53 ++++++++++++++++++++++
 meta/recipes-bsp/grub/grub-efi_2.00.bb             |  1 +
 meta/recipes-bsp/grub/grub_2.00.bb                 |  1 +
 meta/recipes-bsp/grub/grub_git.bb                  |  1 +
 4 files changed, 56 insertions(+)
 create mode 100644 meta/recipes-bsp/grub/files/grub-2.00-add-oe-kernel.patch

-- 
1.8.3.1

[PATCH 1/3] grub 2.00: add oe's kernel name to the conf file

[Robert Yang]

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.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../grub/files/grub-2.00-add-oe-kernel.patch       | 53 ++++++++++++++++++++++
 meta/recipes-bsp/grub/grub_2.00.bb                 |  1 +
 2 files changed, 54 insertions(+)
 create mode 100644 meta/recipes-bsp/grub/files/grub-2.00-add-oe-kernel.patch

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 0000000..eb8916c
--- /dev/null
+++ b/meta/recipes-bsp/grub/files/grub-2.00-add-oe-kernel.patch
@@ -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
+
diff --git a/meta/recipes-bsp/grub/grub_2.00.bb b/meta/recipes-bsp/grub/grub_2.00.bb
index ff9a7c6..c21031b 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 \
           file://check-if-liblzma-is-disabled.patch \
           file://40_custom \
           file://fix-issue-with-flex-2.5.37.patch \
+          file://grub-2.00-add-oe-kernel.patch \
           "
 
 SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c"
-- 
1.8.3.1

[PATCH 2/3] grub git: add oe's kernel name to the conf file

[Robert Yang]

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.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-bsp/grub/grub_git.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-bsp/grub/grub_git.bb b/meta/recipes-bsp/grub/grub_git.bb
index 82a25c9..9b5d9bb 100644
--- a/meta/recipes-bsp/grub/grub_git.bb
+++ b/meta/recipes-bsp/grub/grub_git.bb
@@ -21,6 +21,7 @@ SRCREV = "0776112c5311196889a15058a3b1be4c81ba5e05"
 SRC_URI = "git://git.savannah.gnu.org/grub.git \
            file://40_custom \
            file://autogen.sh-exclude-pc.patch \
+           file://grub-2.00-add-oe-kernel.patch \
           "
 
 S = "${WORKDIR}/git"
-- 
1.8.3.1

[PATCH 3/3] grub-efi: add oe's kernel name to the conf file

[Robert Yang]

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.

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 meta/recipes-bsp/grub/grub-efi_2.00.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta/recipes-bsp/grub/grub-efi_2.00.bb b/meta/recipes-bsp/grub/grub-efi_2.00.bb
index e02def3..e34509a 100644
--- a/meta/recipes-bsp/grub/grub-efi_2.00.bb
+++ b/meta/recipes-bsp/grub/grub-efi_2.00.bb
@@ -27,6 +27,7 @@ SRC_URI = "ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
            file://grub-2.00-ignore-gnulib-gets-stupidity.patch \
            file://fix-issue-with-flex-2.5.37.patch \
            file://grub-efi-allow-a-compilation-without-mcmodel-large.patch \
+           file://grub-2.00-add-oe-kernel.patch \
           "
 SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c"
 SRC_URI[sha256sum] = "65b39a0558f8c802209c574f4d02ca263a804e8a564bc6caf1cd0fd3b3cc11e3"
-- 
1.8.3.1

Re: [PATCH 1/3] grub 2.00: add oe's kernel name to the conf file

[Robert Yang]

On 03/03/2014 10:49 PM, Robert Yang wrote:
> 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.
>
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
>   .../grub/files/grub-2.00-add-oe-kernel.patch       | 53 ++++++++++++++++++++++
>   meta/recipes-bsp/grub/grub_2.00.bb                 |  1 +
>   2 files changed, 54 insertions(+)
>   create mode 100644 meta/recipes-bsp/grub/files/grub-2.00-add-oe-kernel.patch
>
> 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 0000000..eb8916c
> --- /dev/null
> +++ b/meta/recipes-bsp/grub/files/grub-2.00-add-oe-kernel.patch
> @@ -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

I've updated the repo, it should be bzImage, not bzImage[xz].

   git://git.pokylinux.org/poky-contrib rbt/grub
   http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=rbt/grub

// Robert

> +     if grub_file_is_not_garbage "$i"; then
> +     	basename=$(basename $i)
> + 	version=$(echo $basename | sed -e "s,^[^0-9]*-,,g")
> +--
> +1.7.10.4
> +
> diff --git a/meta/recipes-bsp/grub/grub_2.00.bb b/meta/recipes-bsp/grub/grub_2.00.bb
> index ff9a7c6..c21031b 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 \
>             file://check-if-liblzma-is-disabled.patch \
>             file://40_custom \
>             file://fix-issue-with-flex-2.5.37.patch \
> +          file://grub-2.00-add-oe-kernel.patch \
>             "
>
>   SRC_URI[md5sum] = "e927540b6eda8b024fb0391eeaa4091c"
>