diff mbox series

u-boot: update build racecondition patches

Message ID 20250804081132.357059-1-mikko.rapeli@linaro.org
State New
Headers show
Series u-boot: update build racecondition patches | expand

Commit Message

Mikko Rapeli Aug. 4, 2025, 8:11 a.m. UTC 
A different patch was applied upstream after reviews
and testing.

Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
---
 ...dependency-from-lib-to-arch-ARCH-lib.patch |  81 +++++++++++
 ...pts-Makefile.lib-fix-_efi.so-depende.patch | 136 ------------------
 ...kefile-change-apps-from-always-to-ta.patch |  57 --------
 meta/recipes-bsp/u-boot/u-boot-common.inc     |   3 +-
 4 files changed, 82 insertions(+), 195 deletions(-)
 create mode 100644 meta/recipes-bsp/u-boot/files/0001-Makefile-add-dependency-from-lib-to-arch-ARCH-lib.patch
 delete mode 100644 meta/recipes-bsp/u-boot/files/v3-0001-Makefile-scripts-Makefile.lib-fix-_efi.so-depende.patch
 delete mode 100644 meta/recipes-bsp/u-boot/files/v3-0002-efi_loader-Makefile-change-apps-from-always-to-ta.patch
diff mbox series

Patch

diff --git a/meta/recipes-bsp/u-boot/files/0001-Makefile-add-dependency-from-lib-to-arch-ARCH-lib.patch b/meta/recipes-bsp/u-boot/files/0001-Makefile-add-dependency-from-lib-to-arch-ARCH-lib.patch
new file mode 100644
index 000000000000..06fdaf5b0a37
--- /dev/null
+++ b/meta/recipes-bsp/u-boot/files/0001-Makefile-add-dependency-from-lib-to-arch-ARCH-lib.patch
@@ -0,0 +1,81 @@ 
+From d0075e2d730a4fa48aa763a669e5edbc02c33a22 Mon Sep 17 00:00:00 2001
+From: Mikko Rapeli <mikko.rapeli@linaro.org>
+Date: Thu, 31 Jul 2025 14:52:48 +0300
+Subject: [PATCH] Makefile: add dependency from lib to arch/$(ARCH)/lib
+
+Top level Makefile starts separate "make" processes for each each
+subdirectory. lib/efi_loader apps now depend on lib.a from
+arch/$(ARCH)/lib if CONFIG_USE_PRIVATE_LIBGCC is enabled which creates
+a race conditions since dependency from lib/efi_loader EFI apps to
+arch/$(ARCH)/lib/lib.a is not explicit:
+
+arm-poky-linux-gnueabi-ld.bfd: cannot find arch/arm/lib/lib.a: No such file or directory
+make[3]: *** [scripts/Makefile.lib:512: lib/efi_loader/testapp_efi.so] Error 1
+
+This error was seen on yocto/OE-core CI builds after u-boot 2025.07 update:
+
+https://lists.openembedded.org/g/openembedded-core/message/220004
+
+https://autobuilder.yoctoproject.org/valkyrie/api/v2/logs/2914600/raw_inline
+
+    |    rm -f lib/efi_loader/built-in.o; arm-poky-linux-gnueabi-ar cDPrsT lib/efi_loader/built-in.o lib/efi_loader/efi_bootmgr.o lib/efi_loader/efi_bootbin.o lib/efi_loader
+/efi_boottime.o lib/efi_loader/efi_helper.o lib/efi_loader/efi_console.o lib/efi_loader/efi_device_path.o lib/efi_loader/efi_device_path_to_text.o lib/efi_loader/efi_device_
+path_utilities.o lib/efi_loader/efi_dt_fixup.o lib/efi_loader/efi_fdt.o lib/efi_loader/efi_file.o lib/efi_loader/efi_hii.o lib/efi_loader/efi_hii_config.o lib/efi_loader/efi
+_image_loader.o lib/efi_loader/efi_load_options.o lib/efi_loader/efi_memory.o lib/efi_loader/efi_root_node.o lib/efi_loader/efi_runtime.o lib/efi_loader/efi_setup.o lib/efi_
+loader/efi_string.o lib/efi_loader/efi_unicode_collation.o lib/efi_loader/efi_var_common.o lib/efi_loader/efi_var_mem.o lib/efi_loader/efi_variable.o lib/efi_loader/efi_var_
+file.o lib/efi_loader/efi_watchdog.o lib/efi_loader/efi_disk.o lib/efi_loader/efi_net.o lib/efi_loader/efi_smbios.o lib/efi_loader/efi_load_initrd.o lib/efi_loader/efi_confo
+rmance.o
+    |   arm-poky-linux-gnueabi-ld.bfd -nostdlib -zexecstack -znocombreloc -znorelro --no-warn-rwx-segments -L /srv/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-
+3119200/tmp/work/beaglebone_yocto-poky-linux-gnueabi/u-boot/2025.07/sources/u-boot-2025.07 -T arch/arm/lib/elf_arm_efi.lds -shared -Bsymbolic -s lib/efi_loader/helloworld.o
+lib/efi_loader/efi_crt0.o lib/efi_loader/efi_reloc.o lib/efi_loader/efi_freestanding.o arch/arm/lib/lib.a -o lib/efi_loader/helloworld_efi.so
+    | arm-poky-linux-gnueabi-ld.bfd: cannot find arch/arm/lib/lib.a: No such file or directory
+    | make[3]: *** [scripts/Makefile.lib:512: lib/efi_loader/helloworld_efi.so] Error 1
+
+The different "make" processes share common scripts/Makefile.build
+and scripts/Makefile.libs but since they are separate processes
+the Makefile rules can't add a dependency from lib/uefi_loader targets
+to arch/$(ARCH)/lib/lib.a. Or the file level dependency can be added but
+then "make" produces a too sparse error message which does not mention
+that one of the dependencies like arch/$(ARCH)/lib/lib.a was not found:
+
+make[3]: *** No rule to make target 'lib/efi_loader/helloworld.efi', needed by '__build'.  Stop.
+
+Fix this dependency problem by building arch/$(ARCH)/lib before lib
+if CONFIG_USE_PRIVATE_LIBGCC was enabled.
+
+To reproduce the race condition more reliably, add a "sleep 10" delay
+before linker command cmd_link_l_target with 2025.07
+or to $(lib-target): target in scripts/Makefile.build with master branch
+after Kbuild update.
+
+Fixes: 43d43241d1c9 ("scripts/Makefile.lib: add PLATFORM_LIBGCC to efi linking")
+
+Cc: Adriano Cordova <adrianox@gmail.com>
+Cc: Fabio Estevam <festevam@gmail.com>
+Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
+Reviewed-by: Fabio Estevam <festevam@gmail.com>
+---
+ Makefile | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+Upstream-Status: Backport
+
+diff --git a/Makefile b/Makefile
+index c31bf7ecea97..b03f87a93fb9 100644
+--- a/Makefile
++++ b/Makefile
+@@ -2131,6 +2131,11 @@ $(filter-out tools, $(u-boot-dirs)): tools
+ # is "yes"), so compile examples after U-Boot is compiled.
+ examples: $(filter-out examples, $(u-boot-dirs))
+ 
++ifeq ($(CONFIG_USE_PRIVATE_LIBGCC),y)
++# lib/efi_loader apps depend on arch/$(ARCH)/lib for lib.a
++lib: $(filter arch/$(ARCH)/lib, $(u-boot-dirs))
++endif
++
+ # The setlocalversion script comes from linux and expects a
+ # KERNELVERSION variable in the environment for figuring out which
+ # annotated tags are relevant. Pass UBOOTVERSION.
+-- 
+2.43.0
+
diff --git a/meta/recipes-bsp/u-boot/files/v3-0001-Makefile-scripts-Makefile.lib-fix-_efi.so-depende.patch b/meta/recipes-bsp/u-boot/files/v3-0001-Makefile-scripts-Makefile.lib-fix-_efi.so-depende.patch
deleted file mode 100644
index e8253a67b211..000000000000
--- a/meta/recipes-bsp/u-boot/files/v3-0001-Makefile-scripts-Makefile.lib-fix-_efi.so-depende.patch
+++ /dev/null
@@ -1,136 +0,0 @@ 
-From 2e7c1321bb44cc6af4ee4b1026a52e1a0aa7e336 Mon Sep 17 00:00:00 2001
-From: Mikko Rapeli <mikko.rapeli@linaro.org>
-Date: Thu, 10 Jul 2025 14:24:07 +0000
-Subject: [PATCH v3 1/2] Makefile scripts/Makefile.lib: fix *_efi.so dependency
- to PLATFORM_LIBGCC
-
-When PLATFORM_LIBGCC was added to linker command it was not
-added to the dependency of the .so and other rules. Thus a build can
-try to link *_efi.so files before lib.a from PLATFORM_LIBGCC is available.
-This was seen in yocto autobuilder builds with u-boot 2025.07
-update, see https://lists.openembedded.org/g/openembedded-core/message/220004
-
-https://autobuilder.yoctoproject.org/valkyrie/api/v2/logs/2914600/raw_inline
-
-|    rm -f lib/efi_loader/built-in.o; arm-poky-linux-gnueabi-ar cDPrsT lib/efi_loader/built-in.o lib/efi_loader/efi_bootmgr.o lib/efi_loader/efi_bootbin.o lib/efi_loader/efi_boottime.o lib/efi_loader/efi_helper.o lib/efi_loader/efi_console.o lib/efi_loader/efi_device_path.o lib/efi_loader/efi_device_path_to_text.o lib/efi_loader/efi_device_path_utilities.o lib/efi_loader/efi_dt_fixup.o lib/efi_loader/efi_fdt.o lib/efi_loader/efi_file.o lib/efi_loader/efi_hii.o lib/efi_loader/efi_hii_config.o lib/efi_loader/efi_image_loader.o lib/efi_loader/efi_load_options.o lib/efi_loader/efi_memory.o lib/efi_loader/efi_root_node.o lib/efi_loader/efi_runtime.o lib/efi_loader/efi_setup.o lib/efi_loader/efi_string.o lib/efi_loader/efi_unicode_collation.o lib/efi_loader/efi_var_common.o lib/efi_loader/efi_var_mem.o lib/efi_loader/efi_variable.o lib/efi_loader/efi_var_file.o lib/efi_loader/efi_watchdog.o lib/efi_loader/efi_disk.o lib/efi_loader/efi_net.o lib/efi_loader/efi_smbios.o lib/efi_loader/efi_load_initrd.o lib/efi_loader/efi_conformance.o
-|   arm-poky-linux-gnueabi-ld.bfd -nostdlib -zexecstack -znocombreloc -znorelro --no-warn-rwx-segments -L /srv/pokybuild/yocto-worker/oe-selftest-armhost/build/build-st-3119200/tmp/work/beaglebone_yocto-poky-linux-gnueabi/u-boot/2025.07/sources/u-boot-2025.07 -T arch/arm/lib/elf_arm_efi.lds -shared -Bsymbolic -s lib/efi_loader/helloworld.o lib/efi_loader/efi_crt0.o lib/efi_loader/efi_reloc.o lib/efi_loader/efi_freestanding.o arch/arm/lib/lib.a -o lib/efi_loader/helloworld_efi.so
-| arm-poky-linux-gnueabi-ld.bfd: cannot find arch/arm/lib/lib.a: No such file or directory
-| make[3]: *** [scripts/Makefile.lib:512: lib/efi_loader/helloworld_efi.so] Error 1
-
-The issue is hard to reproduce but this change can artificially trigger it:
-
-  a/scripts/Makefile.build
-  b/scripts/Makefile.build
-@@ -353,7 +353,7 @@ $(modorder-target): $(subdir-ym) FORCE
- #
- ifdef lib-target
- quiet_cmd_link_l_target = AR      $@
--cmd_link_l_target = rm -f $@; $(AR) cDPrsT$(KBUILD_ARFLAGS) $@ $(lib-y)
-+cmd_link_l_target = rm -f $@ && echo "HACK, delaying build!" && sleep 60 && $(AR) cDPrsT$(KBUILD_ARFLAGS) $@ $(lib-y)
-
- $(lib-target): $(lib-y) FORCE
-        $(call if_changed,link_l_target)
-
-Then run a rebuild with:
-
-$  rm -f $( find build/ -name lib.a -or -name helloworld_efi.so ) && \
-   make
-...
-  arm-poky-linux-gnueabi-ld.bfd -nostdlib -zexecstack -znocombreloc -znorelro --no-warn-rwx-segments -L /home/mcfrisk/src/base/repo/poky/build_bea
-glebone/tmp/work/beaglebone_yocto-poky-linux-gnueabi/u-boot/2025.07/sources/u-boot-2025.07 -T arch/arm/lib/elf_arm_efi.lds -shared -Bsymbolic -s lib/efi_loader/helloworld.o lib/efi_loader/efi_crt0.o lib/efi_loader/efi_reloc.o lib/efi_loader/efi_freestanding.o arch/arm/lib/lib.a -o lib/efi_loader/helloworld_efi.so
-arm-poky-linux-gnueabi-ld.bfd: cannot find arch/arm/lib/lib.a: No such file or directory
-make[3]: *** [scripts/Makefile.lib:512: lib/efi_loader/helloworld_efi.so] Error 1
-
-Fix by introducing PLATFORM_LIBGCC_LIBA variable with only lib.a
-filename which is then used to add the dependency in rules which use
-PLATFORM_LIBGCC. This should not impact builds which don't set
-PLATFORM_LIBGCC_LIBA and PLATFORM_LIBGCC usage stays as is.
-
-Fixes: 43d43241d1c9 ("scripts/Makefile.lib: add PLATFORM_LIBGCC to efi linking")
-
-Cc: Adriano Cordova <adrianox@gmail.com>
-Cc: Fabio Estevam <festevam@gmail.com>
-Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
----
- Makefile                     | 4 +++-
- examples/standalone/Makefile | 2 +-
- scripts/Makefile.lib         | 2 +-
- scripts/Makefile.xpl         | 3 ++-
- 4 files changed, 7 insertions(+), 4 deletions(-)
-
-Upstream-Status: Submitted [https://lists.denx.de/pipermail/u-boot/2025-July/594581.html]
-
-v3: added "export PLATFORM_LIBGCC_LIBA" like PLATFORM_LIBGCC, not sure
-    how testing worked without this before
-
-v2: introduced PLATFORM_LIBGCC_LIBA variable with just lib.a filename,
-    PLATFORM_LIBGCC can have other flags too
-    https://lists.denx.de/pipermail/u-boot/2025-July/594034.html
-
-v1: https://lists.denx.de/pipermail/u-boot/2025-July/593982.html
-
-diff --git a/Makefile b/Makefile
-index 1a5c77d7caf0..a0797f36f7f6 100644
---- a/Makefile
-+++ b/Makefile
-@@ -911,7 +911,8 @@ u-boot-main := $(libs-y)
- 
- # Add GCC lib
- ifeq ($(CONFIG_USE_PRIVATE_LIBGCC),y)
--PLATFORM_LIBGCC = arch/$(ARCH)/lib/lib.a
-+PLATFORM_LIBGCC_LIBA = arch/$(ARCH)/lib/lib.a
-+PLATFORM_LIBGCC = $(PLATFORM_LIBGCC_LIBA)
- else
- ifndef CONFIG_CC_IS_CLANG
- PLATFORM_LIBGCC := -L $(shell dirname `$(CC) $(c_flags) -print-libgcc-file-name`) -lgcc
-@@ -926,6 +927,7 @@ endif
- 
- export PLATFORM_LIBS
- export PLATFORM_LIBGCC
-+export PLATFORM_LIBGCC_LIBA
- 
- # Special flags for CPP when processing the linker script.
- # Pass the version down so we can handle backwards compatibility
-diff --git a/examples/standalone/Makefile b/examples/standalone/Makefile
-index 9b57f1c0c66c..aa9e3121cf9a 100644
---- a/examples/standalone/Makefile
-+++ b/examples/standalone/Makefile
-@@ -64,7 +64,7 @@ quiet_cmd_link_elf = LD      $@
-       cmd_link_elf = $(LD) $(KBUILD_LDFLAGS) $(LDFLAGS_STANDALONE) -g  \
- 		     -o $@ -e $(SYM_PREFIX)$(@F) $< $(LIB) $(PLATFORM_LIBGCC)
- 
--$(ELF): $(obj)/%: $(obj)/%.o $(LIB) FORCE
-+$(ELF): $(obj)/%: $(obj)/%.o $(LIB) $(PLATFORM_LIBGCC_LIBA) FORCE
- 	$(call if_changed,link_elf)
- 
- $(obj)/%.srec: OBJCOPYFLAGS += -O srec
-diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
-index e89a4a51b74d..cef3863dfdc4 100644
---- a/scripts/Makefile.lib
-+++ b/scripts/Makefile.lib
-@@ -508,7 +508,7 @@ $(obj)/efi_reloc.o: $(srctree)/arch/$(ARCH)/lib/$(EFI_RELOC:.o=.c) $(recordmcoun
- 	$(call cmd,force_checksrc)
- 	$(call if_changed_rule,cc_o_c)
- 
--$(obj)/%_efi.so: $(obj)/%.o $(obj)/efi_crt0.o $(obj)/efi_reloc.o $(obj)/efi_freestanding.o
-+$(obj)/%_efi.so: $(PLATFORM_LIBGCC_LIBA) $(obj)/%.o $(obj)/efi_crt0.o $(obj)/efi_reloc.o $(obj)/efi_freestanding.o
- 	$(call cmd,efi_ld)
- 
- targets += $(obj)/efi_crt0.o $(obj)/efi_reloc.o $(obj)/efi_freestanding.o
-diff --git a/scripts/Makefile.xpl b/scripts/Makefile.xpl
-index 43f27874f9fe..68c88293f0d9 100644
---- a/scripts/Makefile.xpl
-+++ b/scripts/Makefile.xpl
-@@ -139,7 +139,8 @@ libs-y := $(patsubst %/, %/built-in.o, $(libs-y))
- 
- # Add GCC lib
- ifeq ($(CONFIG_USE_PRIVATE_LIBGCC),y)
--PLATFORM_LIBGCC = arch/$(ARCH)/lib/lib.a
-+PLATFORM_LIBGCC_LIBA = arch/$(ARCH)/lib/lib.a
-+PLATFORM_LIBGCC = $(PLATFORM_LIBGCC_LIBA)
- PLATFORM_LIBS := $(filter-out %/lib.a, $(filter-out -lgcc, $(PLATFORM_LIBS))) $(PLATFORM_LIBGCC)
- endif
- 
--- 
-2.43.0
-
diff --git a/meta/recipes-bsp/u-boot/files/v3-0002-efi_loader-Makefile-change-apps-from-always-to-ta.patch b/meta/recipes-bsp/u-boot/files/v3-0002-efi_loader-Makefile-change-apps-from-always-to-ta.patch
deleted file mode 100644
index 6b68f7472410..000000000000
--- a/meta/recipes-bsp/u-boot/files/v3-0002-efi_loader-Makefile-change-apps-from-always-to-ta.patch
+++ /dev/null
@@ -1,57 +0,0 @@ 
-From d207ec22429adc94f9e173971e30c675d2ab3de4 Mon Sep 17 00:00:00 2001
-From: Mikko Rapeli <mikko.rapeli@linaro.org>
-Date: Fri, 18 Jul 2025 08:15:25 +0000
-Subject: [PATCH v3 2/2] efi_loader Makefile: change apps from "always" to
- "targets"
-
-Adding delay to link commands in scripts/Makefile.build
-
-@@ -353,7 +353,7 @@ $(modorder-target): $(subdir-ym) FORCE
- #
- ifdef lib-target
- quiet_cmd_link_l_target = AR      $@
--cmd_link_l_target = rm -f $@; $(AR) cDPrsT$(KBUILD_ARFLAGS) $@ $(lib-y)
-+cmd_link_l_target = rm -f $@; echo "HACK delaying lib-target"; sleep 10; $(AR) cDPrsT$(KBUILD_ARFLAGS) $@ $(lib-y)
-
- $(lib-target): $(lib-y) FORCE
-        $(call if_changed,link_l_target)
-(1/2) Stage this hunk [y,n,q,a,d,j,J,g,/,e,?]? n
-@@ -362,7 +362,7 @@ targets += $(lib-target)
- endif
-
- quiet_cmd_link_multi-y = AR      $@
--cmd_link_multi-y = rm -f $@; $(AR) cDPrsT$(KBUILD_ARFLAGS) $@ $(filter %.o,$^)
-+cmd_link_multi-y = rm -f $@; echo "HACK delaying cmd_link_multi-y"; sleep 10; $(AR) cDPrsT$(KBUILD_ARFLAGS) $@ $(filter %.o,$^)
-
- quiet_cmd_link_multi-m = AR [M]  $@
- cmd_link_multi-m = $(cmd_link_multi-y)
-
-exposes a build failure:
-
-make[3]: *** No rule to make target 'lib/efi_loader/helloworld.efi', needed by '__build'.  Stop.
-make[3]: *** Waiting for unfinished jobs....
-
-This if fixed by using normal targets for .efi apps. The rules
-in scripts/Makefile.lib handle the dependencies correctly.
-
-Signed-off-by: Mikko Rapeli <mikko.rapeli@linaro.org>
----
- lib/efi_loader/Makefile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-Upstream-Status: Submitted [https://lists.denx.de/pipermail/u-boot/2025-July/594583.html]
-
-diff --git a/lib/efi_loader/Makefile b/lib/efi_loader/Makefile
-index cf050e5385dd..e929c23b1cb1 100644
---- a/lib/efi_loader/Makefile
-+++ b/lib/efi_loader/Makefile
-@@ -96,5 +96,5 @@ $(foreach f,$(apps-y),\
- 	$(eval CFLAGS_$(f).o := $(CFLAGS_EFI) -Os -ffreestanding)\
- 	$(eval CFLAGS_REMOVE_$(f).o := $(CFLAGS_NON_EFI)))
- 
--always += $(foreach f,$(apps-y),$(f).efi)
-+targets += $(foreach f,$(apps-y),$(f).efi)
- targets += $(foreach f,$(apps-y),$(f).o)
--- 
-2.43.0
-
diff --git a/meta/recipes-bsp/u-boot/u-boot-common.inc b/meta/recipes-bsp/u-boot/u-boot-common.inc
index 053e68635453..ea55545db34f 100644
--- a/meta/recipes-bsp/u-boot/u-boot-common.inc
+++ b/meta/recipes-bsp/u-boot/u-boot-common.inc
@@ -16,8 +16,7 @@  SRCREV = "e37de002fac3895e8d0b60ae2015e17bb33e2b5b"
 
 SRC_URI = "\
     git://source.denx.de/u-boot/u-boot.git;protocol=https;branch=master;tag=v${PV} \
-    file://v3-0001-Makefile-scripts-Makefile.lib-fix-_efi.so-depende.patch \
-    file://v3-0002-efi_loader-Makefile-change-apps-from-always-to-ta.patch \
+    file://0001-Makefile-add-dependency-from-lib-to-arch-ARCH-lib.patch \
     file://0001-nxp-Prepare-macros-for-KVM-changes.patch \
     file://0002-arm-io.h-Fix-io-accessors-for-KVM.patch \
     file://0003-qemu-arm-Enable-virtualizable-IO-accessors.patch \