[OE-core] [sumo][PATCH v3] u-boot: Fix build race condition

[akuster808]

On 07/26/2018 08:04 AM, Joshua Watt wrote:
> Backports 2f61b13d6acba787b00598d519c85222e993e4ca (included in the
> 2018.07 release) which fixes a race condition when building.
>
> [YOCTO #12705]

Thanks. I will pull in shorly

- armin
>
> Signed-off-by: Joshua Watt <JPEWhacker at gmail.com>
> ---
>  ...efi_loader-avoid-make-race-condition.patch | 51 +++++++++++++++++++
>  .../u-boot/u-boot-common_2018.01.inc          |  1 +
>  2 files changed, 52 insertions(+)
>  create mode 100644 meta/recipes-bsp/u-boot/files/0001-efi_loader-avoid-make-race-condition.patch
>
> 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 at 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 at gmx.de>
> +Signed-off-by: Alexander Graf <agraf at suse.de>
> +
> +Upstream-Status: Backport from 2018.07
> +
> +Signed-off-by: Joshua Watt <JPEWhacker at 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"