diff options
| author |   Joshua Watt <jpewhacker@gmail.com> | 2018-07-26 10:04:09 -0500 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-07-30 00:02:46 +0100 |
| commit | 77586b8e1e50234f34b6c469c41819e36cc8a786 (patch) | |
| tree | d69c80c0ee53ae08b054c02721aa413c7b46bab6 /meta/recipes-bsp | |
| parent | 99ea485195327fcdd63f682a41a4b340a2fd1dda (diff) | |
| download | openembedded-core-contrib-77586b8e1e50234f34b6c469c41819e36cc8a786.tar.gz | |
u-boot: Fix build race condition
Backports 2f61b13d6acba787b00598d519c85222e993e4ca (included in the
2018.07 release) which fixes a race condition when building.
[YOCTO #12705]
Signed-off-by: Joshua Watt <JPEWhacker@gmail.com>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta/recipes-bsp')
| -rw-r--r-- | meta/recipes-bsp/u-boot/files/0001-efi_loader-avoid-make-race-condition.patch | 51 | ||||
| -rw-r--r-- | meta/recipes-bsp/u-boot/u-boot-common_2018.01.inc | 1 |
2 files changed, 52 insertions, 0 deletions
diff --git a/meta/recipes-bsp/u-boot/files/0001-efi_loader-avoid-make-race-condition.patch b/meta/recipes-bsp/u-boot/files/0001-efi_loader-avoid-make-race-condition.patch new file mode 100644 index 0000000000..da7e27c64c --- /dev/null +++ b/meta/recipes-bsp/u-boot/files/0001-efi_loader-avoid-make-race-condition.patch @@ -0,0 +1,51 @@ +From 5c2e24a9ed54dfee77d1844a080e998b4affe916 Mon Sep 17 00:00:00 2001 +From: Heinrich Schuchardt <xypron.glpk@gmx.de> +Date: Sat, 2 Jun 2018 19:00:41 +0200 +Subject: [PATCH] efi_loader: avoid make race condition + +When U-Boot is built with 'make -j' there is not guarantee that targets in +directory arch/ are built before targets in directory lib/. The current +build instruction for EFI binaries in lib/ rely on dependencies in arch/. +If $(EFI_CRT0) or $(EFI_RELOC) is not yet built before trying to build +%.efi an error + *** No rule to make target '%.efi' +occurs. + +With the patch separate copies of $(EFI_CRT0) and $(EFI_RELOC) named +efi_crt0.o and efi_reloc.o are built in lib/efi_loader and +lib/efi_selftest. + +Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> +Signed-off-by: Alexander Graf <agraf@suse.de> + +Upstream-Status: Backport from 2018.07 + +Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> +--- + scripts/Makefile.lib | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib +index 8f19b2db56..f2f398c935 100644 +--- a/scripts/Makefile.lib ++++ b/scripts/Makefile.lib +@@ -404,8 +404,14 @@ cmd_efi_ld = $(LD) -nostdlib -znocombreloc -T $(EFI_LDS_PATH) -shared \ + + EFI_LDS_PATH = $(srctree)/arch/$(ARCH)/lib/$(EFI_LDS) + +-$(obj)/%_efi.so: $(obj)/%.o arch/$(ARCH)/lib/$(EFI_CRT0) \ +- arch/$(ARCH)/lib/$(EFI_RELOC) ++$(obj)/efi_crt0.o: $(srctree)/arch/$(ARCH)/lib/$(EFI_CRT0:.o=.S) ++ $(call if_changed_dep,as_o_S) ++ ++$(obj)/efi_reloc.o: $(srctree)/arch/$(ARCH)/lib/$(EFI_RELOC:.o=.c) $(recordmcount_source) FORCE ++ $(call cmd,force_checksrc) ++ $(call if_changed_rule,cc_o_c) ++ ++$(obj)/%_efi.so: $(obj)/%.o $(obj)/efi_crt0.o $(obj)/efi_reloc.o + $(call cmd,efi_ld) + + # ACPI +-- +2.17.1 + diff --git a/meta/recipes-bsp/u-boot/u-boot-common_2018.01.inc b/meta/recipes-bsp/u-boot/u-boot-common_2018.01.inc index d2073ea0c7..11b82b7e26 100644 --- a/meta/recipes-bsp/u-boot/u-boot-common_2018.01.inc +++ b/meta/recipes-bsp/u-boot/u-boot-common_2018.01.inc @@ -11,6 +11,7 @@ SRCREV = "f3dd87e0b98999a78e500e8c6d2b063ebadf535a" SRC_URI = "git://git.denx.de/u-boot.git \ file://MPC8315ERDB-enable-DHCP.patch \ + file://0001-efi_loader-avoid-make-race-condition.patch \ " S = "${WORKDIR}/git" |