diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2019-03-10 20:11:19 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-03-11 05:36:37 -0700 |
commit | 86e2a71a3f4b3a25326c1bf7086af8e040c74bf8 (patch) | |
tree | e272371887f8819897e69e619f7a7851605c7e11 /meta/recipes-bsp/grub/files | |
parent | e3f51d74d4438d303568609dc53dc34f51937a38 (diff) | |
download | poky-86e2a71a3f4b3a25326c1bf7086af8e040c74bf8.tar.gz |
grub: fix build with squashfs support enabled
(From OE-Core rev: 342f7cc6b07559238274ff2fe281afa4ea742052)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/grub/files')
-rw-r--r-- | meta/recipes-bsp/grub/files/fix.build.with.squashfs.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/meta/recipes-bsp/grub/files/fix.build.with.squashfs.patch b/meta/recipes-bsp/grub/files/fix.build.with.squashfs.patch new file mode 100644 index 0000000000..2c2d2ea0b1 --- /dev/null +++ b/meta/recipes-bsp/grub/files/fix.build.with.squashfs.patch | |||
@@ -0,0 +1,24 @@ | |||
1 | When squashfs support is enabled, the build fails with: | ||
2 | |||
3 | ../grub-2.02/grub-core/fs/squash4.c: In function 'direct_read': | ||
4 | ../grub-2.02/grub-core/fs/squash4.c:868:10: error: 'err' may be used uninitialized in this function [-Werror=maybe-uninitialized] | ||
5 | if (err) | ||
6 | ^ | ||
7 | cc1: all warnings being treated as errors | ||
8 | Makefile:7272: recipe for target 'grub-core/fs/libgrubmods_a-squash4.o' failed | ||
9 | |||
10 | Upstream-Status: Pending (should be fixed in gnulib which is then rarely updated in grub) | ||
11 | |||
12 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> | ||
13 | |||
14 | --- grub-2.02/grub-core/fs/squash4.c 2019-03-10 20:00:14.070468728 +0000 | ||
15 | +++ grub-2.02.fixed/grub-core/fs/squash4.c 2019-03-10 19:58:31.382477818 +0000 | ||
16 | @@ -746,7 +746,7 @@ | ||
17 | struct grub_squash_cache_inode *ino, | ||
18 | grub_off_t off, char *buf, grub_size_t len) | ||
19 | { | ||
20 | - grub_err_t err; | ||
21 | + grub_err_t err = 0; | ||
22 | grub_off_t cumulated_uncompressed_size = 0; | ||
23 | grub_uint64_t a = 0; | ||
24 | grub_size_t i; | ||