diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2024-01-23 16:47:34 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-01-24 15:46:19 +0000 |
commit | fa809fd07390a2983695bd63270d05690fa854b9 (patch) | |
tree | c7cb2ec991e3b29e205a723466b68cac3c4a0b4b /meta/recipes-bsp/grub/files/0001-grub.d-10_linux.in-add-oe-s-kernel-name.patch | |
parent | 0a010ac1b46651aaaf57008fb9e6db656822b2e4 (diff) | |
download | poky-fa809fd07390a2983695bd63270d05690fa854b9.tar.gz |
grub2: upgrade 2.06 -> 2.12
Drop patches that have been upstreamed. Refresh others.
This version dropped extra_deps.lst from the tarball [1] and that leads
to build failures. Restore it in do_configure for now.
[1] https://git.savannah.gnu.org/cgit/grub.git/commit/?id=b835601c7639ed1890f2d3db91900a8506011a8e
(From OE-Core rev: 7c8e1e48075f7f54aec9d295605c982f440be5d5)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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.patch | 10 |
1 files changed, 5 insertions, 5 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 69b04aa56f..69dec7695a 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 @@ | |||
1 | From 8f47ed4aaefba087b6ca76e59c9f832b6a0702bc Mon Sep 17 00:00:00 2001 | 1 | From a80592e20f6c4b928a22862f52f268ab9d9908b2 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Wed, 13 Jan 2016 19:28:00 +0000 | 3 | Date: Wed, 13 Jan 2016 19:28:00 +0000 |
4 | Subject: [PATCH] grub.d/10_linux.in: add oe's kernel name | 4 | Subject: [PATCH] grub.d/10_linux.in: add oe's kernel name |
@@ -20,10 +20,10 @@ Upstream-Status: Inappropriate [OE specific] | |||
20 | 2 files changed, 4 insertions(+), 4 deletions(-) | 20 | 2 files changed, 4 insertions(+), 4 deletions(-) |
21 | 21 | ||
22 | diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in | 22 | diff --git a/util/grub.d/10_linux.in b/util/grub.d/10_linux.in |
23 | index 4532266..cba2617 100644 | 23 | index cc393be..8545cb6 100644 |
24 | --- a/util/grub.d/10_linux.in | 24 | --- a/util/grub.d/10_linux.in |
25 | +++ b/util/grub.d/10_linux.in | 25 | +++ b/util/grub.d/10_linux.in |
26 | @@ -164,12 +164,12 @@ machine=`uname -m` | 26 | @@ -166,12 +166,12 @@ machine=`uname -m` |
27 | case "x$machine" in | 27 | case "x$machine" in |
28 | xi?86 | xx86_64) | 28 | xi?86 | xx86_64) |
29 | list= | 29 | list= |
@@ -40,10 +40,10 @@ index 4532266..cba2617 100644 | |||
40 | done ;; | 40 | done ;; |
41 | esac | 41 | esac |
42 | diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in | 42 | diff --git a/util/grub.d/20_linux_xen.in b/util/grub.d/20_linux_xen.in |
43 | index 96179ea..98d16ae 100644 | 43 | index 94dd8be..36cd554 100644 |
44 | --- a/util/grub.d/20_linux_xen.in | 44 | --- a/util/grub.d/20_linux_xen.in |
45 | +++ b/util/grub.d/20_linux_xen.in | 45 | +++ b/util/grub.d/20_linux_xen.in |
46 | @@ -154,7 +154,7 @@ EOF | 46 | @@ -181,7 +181,7 @@ EOF |
47 | } | 47 | } |
48 | 48 | ||
49 | linux_list= | 49 | linux_list= |