diff options
author | Khem Raj <raj.khem@gmail.com> | 2021-03-26 12:12:14 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-03-28 22:28:27 +0100 |
commit | 57b37e3b03d9074bdb6bed5cc4a850385332cc63 (patch) | |
tree | ae3e839f13975cfe37f08d5a9172a7c19d45c9b2 /meta/recipes-bsp | |
parent | ab91b0756d819343a83625c58adb9626610864f8 (diff) | |
download | poky-57b37e3b03d9074bdb6bed5cc4a850385332cc63.tar.gz |
grub-efi: Re-introduce lost cast to long
This cast was accidentally dropped in
https://git.savannah.gnu.org/cgit/grub.git/commit/?id=2bf40e9e5be9808b17852e688eead87acff14420
(From OE-Core rev: c032297695e9e4bb4d0fb12dc883044bdfa870f2)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Alistair Francis <alistair.francis@wdc.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r-- | meta/recipes-bsp/grub/files/0001-RISC-V-Restore-the-typcast-to-long.patch | 29 | ||||
-rw-r--r-- | meta/recipes-bsp/grub/grub2.inc | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/meta/recipes-bsp/grub/files/0001-RISC-V-Restore-the-typcast-to-long.patch b/meta/recipes-bsp/grub/files/0001-RISC-V-Restore-the-typcast-to-long.patch new file mode 100644 index 0000000000..f0ffb3d954 --- /dev/null +++ b/meta/recipes-bsp/grub/files/0001-RISC-V-Restore-the-typcast-to-long.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From bf248231cb4f9f966f0d57821dd0491af54d4a0b Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Fri, 26 Mar 2021 11:59:43 -0700 | ||
4 | Subject: [PATCH] RISC-V: Restore the typcast to long | ||
5 | |||
6 | this makes the type promotions clear and explicit | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | util/grub-mkimagexx.c | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c | ||
15 | index 00f49cc..ab5523d 100644 | ||
16 | --- a/util/grub-mkimagexx.c | ||
17 | +++ b/util/grub-mkimagexx.c | ||
18 | @@ -1242,7 +1242,7 @@ SUFFIX (relocate_addrs) (Elf_Ehdr *e, struct section_metadata *smd, | ||
19 | */ | ||
20 | |||
21 | sym_addr += addend; | ||
22 | - off = sym_addr - target_section_addr - offset - image_target->vaddr_offset; | ||
23 | + off = (long)sym_addr - target_section_addr - offset - image_target->vaddr_offset; | ||
24 | |||
25 | switch (ELF_R_TYPE (info)) | ||
26 | { | ||
27 | -- | ||
28 | 2.31.0 | ||
29 | |||
diff --git a/meta/recipes-bsp/grub/grub2.inc b/meta/recipes-bsp/grub/grub2.inc index d88c3fd3ad..0e431ac008 100644 --- a/meta/recipes-bsp/grub/grub2.inc +++ b/meta/recipes-bsp/grub/grub2.inc | |||
@@ -19,6 +19,7 @@ SRC_URI = "https://alpha.gnu.org/gnu/grub/grub-${REALPV}.tar.xz \ | |||
19 | file://grub-module-explicitly-keeps-symbole-.module_license.patch \ | 19 | file://grub-module-explicitly-keeps-symbole-.module_license.patch \ |
20 | file://0001-grub.d-10_linux.in-add-oe-s-kernel-name.patch \ | 20 | file://0001-grub.d-10_linux.in-add-oe-s-kernel-name.patch \ |
21 | file://determinism.patch \ | 21 | file://determinism.patch \ |
22 | file://0001-RISC-V-Restore-the-typcast-to-long.patch \ | ||
22 | " | 23 | " |
23 | 24 | ||
24 | SRC_URI[sha256sum] = "2c87f1f21e2ab50043e6cd9163c08f1b6c3a6171556bf23ff9ed65b074145484" | 25 | SRC_URI[sha256sum] = "2c87f1f21e2ab50043e6cd9163c08f1b6c3a6171556bf23ff9ed65b074145484" |