summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp/grub/files/0001-grub.d-10_linux.in-add-oe-s-kernel-name.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-bsp/grub/files/0001-grub.d-10_linux.in-add-oe-s-kernel-name.patch')
-rw-r--r--meta/recipes-bsp/grub/files/0001-grub.d-10_linux.in-add-oe-s-kernel-name.patch16
1 files changed, 7 insertions, 9 deletions
diff --git a/meta/recipes-bsp/grub/files/0001-grub.d-10_linux.in-add-oe-s-kernel-name.patch b/meta/recipes-bsp/grub/files/0001-grub.d-10_linux.in-add-oe-s-kernel-name.patch
index d5bfaa177a..69b04aa56f 100644
--- a/meta/recipes-bsp/grub/files/0001-grub.d-10_linux.in-add-oe-s-kernel-name.patch
+++ b/meta/recipes-bsp/grub/files/0001-grub.d-10_linux.in-add-oe-s-kernel-name.patch
@@ -1,4 +1,4 @@
1From b512c77222a8b133d7dd71a0dcef081a921d97d4 Mon Sep 17 00:00:00 2001 1From 8f47ed4aaefba087b6ca76e59c9f832b6a0702bc Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com> 2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 13 Jan 2016 19:28:00 +0000 3Date: Wed, 13 Jan 2016 19:28:00 +0000
4Subject: [PATCH] grub.d/10_linux.in: add oe's kernel name 4Subject: [PATCH] grub.d/10_linux.in: add oe's kernel name
@@ -11,18 +11,19 @@ to util/grub.d/20_linux_xen.in to keep compatibility.
11 11
12Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 12Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
13Signed-off-by: Khem Raj <raj.khem@gmail.com> 13Signed-off-by: Khem Raj <raj.khem@gmail.com>
14--- 14
15Upstream-Status: Inappropriate [OE specific] 15Upstream-Status: Inappropriate [OE specific]
16 16
17---
17 util/grub.d/10_linux.in | 6 +++--- 18 util/grub.d/10_linux.in | 6 +++---
18 util/grub.d/20_linux_xen.in | 2 +- 19 util/grub.d/20_linux_xen.in | 2 +-
19 2 files changed, 4 insertions(+), 4 deletions(-) 20 2 files changed, 4 insertions(+), 4 deletions(-)
20 21
21diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in 22diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in
22index 859b608..946be5d 100644 23index 4532266..cba2617 100644
23--- a/util/grub.d/10_linux.in 24--- a/util/grub.d/10_linux.in
24+++ b/util/grub.d/10_linux.in 25+++ b/util/grub.d/10_linux.in
25@@ -148,12 +148,12 @@ machine=`uname -m` 26@@ -164,12 +164,12 @@ machine=`uname -m`
26 case "x$machine" in 27 case "x$machine" in
27 xi?86 | xx86_64) 28 xi?86 | xx86_64)
28 list= 29 list=
@@ -39,10 +40,10 @@ index 859b608..946be5d 100644
39 done ;; 40 done ;;
40 esac 41 esac
41diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in 42diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in
42index f532fb9..1994244 100644 43index 96179ea..98d16ae 100644
43--- a/util/grub.d/20_linux_xen.in 44--- a/util/grub.d/20_linux_xen.in
44+++ b/util/grub.d/20_linux_xen.in 45+++ b/util/grub.d/20_linux_xen.in
45@@ -138,7 +138,7 @@ EOF 46@@ -154,7 +154,7 @@ EOF
46 } 47 }
47 48
48 linux_list= 49 linux_list=
@@ -51,6 +52,3 @@ index f532fb9..1994244 100644
51 if grub_file_is_not_garbage "$i"; then 52 if grub_file_is_not_garbage "$i"; then
52 basename=$(basename $i) 53 basename=$(basename $i)
53 version=$(echo $basename | sed -e "s,^[^0-9]*-,,g") 54 version=$(echo $basename | sed -e "s,^[^0-9]*-,,g")
54--
552.7.0
56