From 16bc658018e56196c03542c57220e5ddce8c8daa Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Wed, 14 Dec 2022 14:32:23 -0500 Subject: [PATCH] coreboot 4.11: Re-add patch removed by error which was a race condition patch --- .../0073-build-race-condition-fixes.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 patches/coreboot-4.11/0073-build-race-condition-fixes.patch diff --git a/patches/coreboot-4.11/0073-build-race-condition-fixes.patch b/patches/coreboot-4.11/0073-build-race-condition-fixes.patch new file mode 100644 index 00000000..59da6ee2 --- /dev/null +++ b/patches/coreboot-4.11/0073-build-race-condition-fixes.patch @@ -0,0 +1,30 @@ +src/arch/x86: Ensure $(objgenerated) exists before it's used + +In some rare cases it seems that make tries to build +$(objgenerated)/assembly.inc before the build-dirs target has finished, +and so assembly.inc can't be written. Enforce that build-dirs is done +before assembly.inc starts. + +BUG=chromium:1098215 +BRANCH=none +TEST=none + +Change-Id: Ib141ea45a43836cfdde0059523c331fe5286b06d +Signed-off-by: Patrick Georgi +Reviewed-on: https://review.coreboot.org/c/coreboot/+/42883 +Tested-by: build bot (Jenkins) +Reviewed-by: Aaron Durbin + +diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc +index 6297384..1a1aa40 100644 +--- a/src/arch/x86/Makefile.inc ++++ b/src/arch/x86/Makefile.inc + +@@ -50,7 +50,7 @@ + # into a single generated file. + crt0s = $(cpu_incs-y) + +-$(objgenerated)/assembly.inc: $$(crt0s) ++$(objgenerated)/assembly.inc: build-dirs $$(crt0s) + @printf " GEN $(subst $(obj)/,,$(@))\n" + printf '$(foreach crt0,$(crt0s),#include "$(crt0)"\n)' > $@