ExternalVendorCode/heads
1
0
Fork 0
mirror of https://github.com/linuxboot/heads.git synced 2025-01-31 00:24:17 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1264 from JonathonHall-Purism/coreboot-4.11-patch-fix

Browse Source
This commit is contained in:
tlaurion 2023-01-04 11:21:24 -05:00 committed by GitHub
commit 6a82894894
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
patches/coreboot-4.11/0073-build-race-condition-fixes.patch
View File

@ -16,11 +16,10 @@ Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Aaron Durbin <adurbin@chromium.org> Reviewed-by: Aaron Durbin <adurbin@chromium.org>
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 6297384..1a1aa40 100644 index cc094d1..132c6d8 100644
--- a/src/arch/x86/Makefile.inc --- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc
@@ -56,7 +56,7 @@ pci$(stripped_vgabios_dgpu_id).rom-type := optionrom
@@ -50,7 +50,7 @@
# into a single generated file. # into a single generated file.
crt0s = $(cpu_incs-y) crt0s = $(cpu_incs-y)
@ -28,3 +27,4 @@ index 6297384..1a1aa40 100644
+$(objgenerated)/assembly.inc: build-dirs $$(crt0s) +$(objgenerated)/assembly.inc: build-dirs $$(crt0s)
@printf " GEN $(subst $(obj)/,,$(@))\n" @printf " GEN $(subst $(obj)/,,$(@))\n"
printf '$(foreach crt0,$(crt0s),#include "$(crt0)"\n)' > $@ printf '$(foreach crt0,$(crt0s),#include "$(crt0)"\n)' > $@