diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2023-07-27 16:36:14 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-07-30 09:16:52 +0100 |
commit | 7943dbae850301433bc81a0080b4f25d4d3102d6 (patch) | |
tree | 7d3f15dd9324bf2d0f585ae56dbb7ae226b5f919 /meta/recipes-bsp | |
parent | fc8241a60635a86dc977abd917ecb7860f443354 (diff) | |
download | poky-7943dbae850301433bc81a0080b4f25d4d3102d6.tar.gz |
gnu-efi: upgrade 3.0.15 -> 3.0.17
Unset LDFLAGS as the standard ones do not work when linking EFI binaries
(the new version of gnu-efi adds various apps).
(From OE-Core rev: b4b94acef1e2c5e5f1185ae165969c8a66038b17)
Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r-- | meta/recipes-bsp/gnu-efi/gnu-efi_3.0.17.bb (renamed from meta/recipes-bsp/gnu-efi/gnu-efi_3.0.15.bb) | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.15.bb b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.17.bb index 5ae6f391ae..547c469d19 100644 --- a/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.15.bb +++ b/meta/recipes-bsp/gnu-efi/gnu-efi_3.0.17.bb | |||
@@ -17,7 +17,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/files/${BP}.tar.bz2 \ | |||
17 | file://gnu-efi-3.0.9-fix-clang-build.patch \ | 17 | file://gnu-efi-3.0.9-fix-clang-build.patch \ |
18 | " | 18 | " |
19 | 19 | ||
20 | SRC_URI[sha256sum] = "931a257b9c5c1ba65ff519f18373c438a26825f2db7866b163e96d1b168f20ea" | 20 | SRC_URI[sha256sum] = "7807e903349343a7a142ebb934703a2872235e89688cf586c032b0a1087bcaf4" |
21 | 21 | ||
22 | COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*|riscv64.*)-linux" | 22 | COMPATIBLE_HOST = "(x86_64.*|i.86.*|aarch64.*|arm.*|riscv64.*)-linux" |
23 | COMPATIBLE_HOST:armv4 = 'null' | 23 | COMPATIBLE_HOST:armv4 = 'null' |
@@ -34,6 +34,10 @@ def gnu_efi_arch(d): | |||
34 | return "ia32" | 34 | return "ia32" |
35 | return tarch | 35 | return tarch |
36 | 36 | ||
37 | do_compile:prepend() { | ||
38 | unset LDFLAGS | ||
39 | } | ||
40 | |||
37 | EXTRA_OEMAKE = "'ARCH=${@gnu_efi_arch(d)}' 'CC=${CC}' 'AS=${AS}' 'LD=${LD}' 'AR=${AR}' \ | 41 | EXTRA_OEMAKE = "'ARCH=${@gnu_efi_arch(d)}' 'CC=${CC}' 'AS=${AS}' 'LD=${LD}' 'AR=${AR}' \ |
38 | 'RANLIB=${RANLIB}' 'OBJCOPY=${OBJCOPY}' 'PREFIX=${prefix}' 'LIBDIR=${libdir}' \ | 42 | 'RANLIB=${RANLIB}' 'OBJCOPY=${OBJCOPY}' 'PREFIX=${prefix}' 'LIBDIR=${libdir}' \ |
39 | " | 43 | " |
@@ -46,7 +50,7 @@ do_install() { | |||
46 | oe_runmake install INSTALLROOT="${D}" | 50 | oe_runmake install INSTALLROOT="${D}" |
47 | } | 51 | } |
48 | 52 | ||
49 | FILES:${PN} += "${libdir}/*.lds" | 53 | FILES:${PN} += "${libdir}/*.lds ${libdir}/gnuefi/apps" |
50 | 54 | ||
51 | # 64-bit binaries are expected for EFI when targeting X32 | 55 | # 64-bit binaries are expected for EFI when targeting X32 |
52 | INSANE_SKIP:${PN}-dev:append:linux-gnux32 = " arch" | 56 | INSANE_SKIP:${PN}-dev:append:linux-gnux32 = " arch" |