mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-21 12:32:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

grub: fix build with squashfs support enabled

Browse Source 
(From OE-Core rev: 342f7cc6b07559238274ff2fe281afa4ea742052)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Martin Jansa
2019-03-10 20:11:19 +00:00
committed by Richard Purdie
parent e3f51d74d4
commit 86e2a71a3f
2 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
meta/recipes-bsp/grub/files/fix.build.with.squashfs.patch Normal file
View File

@@ -0,0 +1,24 @@
When squashfs support is enabled, the build fails with:
../grub-2.02/grub-core/fs/squash4.c: In function 'direct_read':
../grub-2.02/grub-core/fs/squash4.c:868:10: error: 'err' may be used uninitialized in this function [-Werror=maybe-uninitialized]
if (err)
^
cc1: all warnings being treated as errors
Makefile:7272: recipe for target 'grub-core/fs/libgrubmods_a-squash4.o' failed
Upstream-Status: Pending (should be fixed in gnulib which is then rarely updated in grub)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
--- grub-2.02/grub-core/fs/squash4.c 2019-03-10 20:00:14.070468728 +0000
+++ grub-2.02.fixed/grub-core/fs/squash4.c 2019-03-10 19:58:31.382477818 +0000
@@ -746,7 +746,7 @@
struct grub_squash_cache_inode *ino,
grub_off_t off, char *buf, grub_size_t len)
{
- grub_err_t err;
+ grub_err_t err = 0;
grub_off_t cumulated_uncompressed_size = 0;
grub_uint64_t a = 0;
grub_size_t i;

1
meta/recipes-bsp/grub/grub2.inc
View File

@@ -22,6 +22,7 @@ SRC_URI = "https://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \
file://0001-x86-64-Treat-R_X86_64_PLT32-as-R_X86_64_PC32.patch \
file://0001-grub-setup-Debug-message-cleanup.patch \
file://disable-address-of-packed-member.patch \
file://fix.build.with.squashfs.patch \
"
SRC_URI[md5sum] = "1116d1f60c840e6dbd67abbc99acb45d"
SRC_URI[sha256sum] = "660ee136fbcee08858516ed4de2ad87068bfe1b6b8b37896ce3529ff054a726d"