diff options
author | Anuj Mittal <anuj.mittal@intel.com> | 2019-07-29 11:20:26 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-31 13:50:46 +0100 |
commit | cfb190a3c9771b382d994702a6e74bb662bf6a8c (patch) | |
tree | 85fc94dbf4ec102b1e86fab99ee1be5ea34ebdf7 /meta/recipes-bsp/grub/files/0001-grub-setup-Debug-message-cleanup.patch | |
parent | 07ba3a1d7320946c22a3dafefcb2aab6b1906b90 (diff) | |
download | poky-cfb190a3c9771b382d994702a6e74bb662bf6a8c.tar.gz |
grub: upgrade 2.02 -> 2.04
* For changes in this version, see:
http://git.savannah.gnu.org/cgit/grub.git/tree/NEWS?h=grub-2.04
* Remove backported patches and refresh others.
* Remove the musl patch as it's no longer needed.
* Use configure option --disable-werror instead of passing through CFLAGS.
(From OE-Core rev: 07222d213d1da0ccade1c61ed19a7ecdc4966edd)
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-setup-Debug-message-cleanup.patch')
-rw-r--r-- | meta/recipes-bsp/grub/files/0001-grub-setup-Debug-message-cleanup.patch | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/meta/recipes-bsp/grub/files/0001-grub-setup-Debug-message-cleanup.patch b/meta/recipes-bsp/grub/files/0001-grub-setup-Debug-message-cleanup.patch deleted file mode 100644 index e01fcdffb0..0000000000 --- a/meta/recipes-bsp/grub/files/0001-grub-setup-Debug-message-cleanup.patch +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | From 4e9d9358e0cda6d01020005eb6343e3b69f7201a Mon Sep 17 00:00:00 2001 | ||
2 | From: Cao jin <caoj.fnst@cn.fujitsu.com> | ||
3 | Date: Tue, 3 Jul 2018 18:51:13 +0800 | ||
4 | Subject: [PATCH] grub-setup: Debug message cleanup | ||
5 | |||
6 | Variable "root" is initialized after root device probing and is null in | ||
7 | current place, so, drop it. | ||
8 | |||
9 | Signed-off-by: Cao jin <caoj.fnst@cn.fujitsu.com> | ||
10 | Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com> | ||
11 | --- | ||
12 | Upstream-Status: Backport [http://git.savannah.gnu.org/cgit/grub.git/commit/?id=4e9d9358e0cda6d01020005eb6343e3b69f7201a] | ||
13 | |||
14 | util/setup.c | 3 +-- | ||
15 | 1 file changed, 1 insertion(+), 2 deletions(-) | ||
16 | |||
17 | diff --git a/util/setup.c b/util/setup.c | ||
18 | index 80363075d..9c1e1b7da 100644 | ||
19 | --- a/util/setup.c | ||
20 | +++ b/util/setup.c | ||
21 | @@ -305,9 +305,8 @@ SETUP (const char *dir, | ||
22 | bl.first_block = (struct grub_boot_blocklist *) (core_img | ||
23 | + GRUB_DISK_SECTOR_SIZE | ||
24 | - sizeof (*bl.block)); | ||
25 | - grub_util_info ("root is `%s', dest is `%s'", root, dest); | ||
26 | |||
27 | - grub_util_info ("Opening dest"); | ||
28 | + grub_util_info ("Opening dest `%s'", dest); | ||
29 | dest_dev = grub_device_open (dest); | ||
30 | if (! dest_dev) | ||
31 | grub_util_error ("%s", grub_errmsg); | ||
32 | -- | ||
33 | 2.17.2 (Apple Git-113) | ||
34 | |||