From 16bc658018e56196c03542c57220e5ddce8c8daa Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Wed, 14 Dec 2022 14:32:23 -0500 Subject: [PATCH 1/2] 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)' > $@ From 14adf647eb593515b4f48c3d97ce94c9c3f0462a Mon Sep 17 00:00:00 2001 From: Thierry Laurion Date: Wed, 14 Dec 2022 14:33:43 -0500 Subject: [PATCH 2/2] coreboot 4.13: remove transient patch to download over http instead of https --- ...-builgcc_temp_fix_from_https_to_http.patch | 40 ------------------- 1 file changed, 40 deletions(-) delete mode 100644 patches/coreboot-4.13/0080-util-crossgcc-builgcc_temp_fix_from_https_to_http.patch diff --git a/patches/coreboot-4.13/0080-util-crossgcc-builgcc_temp_fix_from_https_to_http.patch b/patches/coreboot-4.13/0080-util-crossgcc-builgcc_temp_fix_from_https_to_http.patch deleted file mode 100644 index ee08c01c..00000000 --- a/patches/coreboot-4.13/0080-util-crossgcc-builgcc_temp_fix_from_https_to_http.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/util/crossgcc/buildgcc.orig 2021-01-03 19:56:28.980000000 -0500 -+++ b/util/crossgcc/buildgcc 2021-01-03 19:56:32.098000000 -0500 -@@ -52,22 +52,22 @@ - # These are sanitized by the jenkins toolchain test builder, so if - # a completely new URL is added here, it probably needs to be added - # to the jenkins build as well, or the builder won't download it. --GMP_ARCHIVE="https://ftpmirror.gnu.org/gmp/gmp-${GMP_VERSION}.tar.xz" --MPFR_ARCHIVE="https://ftpmirror.gnu.org/mpfr/mpfr-${MPFR_VERSION}.tar.xz" --MPC_ARCHIVE="https://ftpmirror.gnu.org/mpc/mpc-${MPC_VERSION}.tar.gz" --GCC_ARCHIVE="https://ftpmirror.gnu.org/gcc/gcc-${GCC_VERSION}/gcc-${GCC_VERSION}.tar.xz" --BINUTILS_ARCHIVE="https://ftpmirror.gnu.org/binutils/binutils-${BINUTILS_VERSION}.tar.xz" --GDB_ARCHIVE="https://ftpmirror.gnu.org/gdb/gdb-${GDB_VERSION}.tar.xz" --IASL_ARCHIVE="https://acpica.org/sites/acpica/files/acpica-unix2-${IASL_VERSION}.tar.gz" --PYTHON_ARCHIVE="https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tar.xz" --EXPAT_ARCHIVE="https://downloads.sourceforge.net/sourceforge/expat/expat-${EXPAT_VERSION}.tar.bz2" -+GMP_ARCHIVE="http://ftpmirror.gnu.org/gmp/gmp-${GMP_VERSION}.tar.xz" -+MPFR_ARCHIVE="http://ftpmirror.gnu.org/mpfr/mpfr-${MPFR_VERSION}.tar.xz" -+MPC_ARCHIVE="http://ftpmirror.gnu.org/mpc/mpc-${MPC_VERSION}.tar.gz" -+GCC_ARCHIVE="http://ftpmirror.gnu.org/gcc/gcc-${GCC_VERSION}/gcc-${GCC_VERSION}.tar.xz" -+BINUTILS_ARCHIVE="http://ftpmirror.gnu.org/binutils/binutils-${BINUTILS_VERSION}.tar.xz" -+GDB_ARCHIVE="http://ftpmirror.gnu.org/gdb/gdb-${GDB_VERSION}.tar.xz" -+IASL_ARCHIVE="http://acpica.org/sites/acpica/files/acpica-unix2-${IASL_VERSION}.tar.gz" -+PYTHON_ARCHIVE="http://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VERSION}.tar.xz" -+EXPAT_ARCHIVE="http://downloads.sourceforge.net/sourceforge/expat/expat-${EXPAT_VERSION}.tar.bz2" - # CLANG toolchain archive locations --LLVM_ARCHIVE="https://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VERSION}/llvm-${CLANG_VERSION}.src.tar.xz" --CLANG_ARCHIVE="https://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VERSION}/clang-${CLANG_VERSION}.src.tar.xz" --CRT_ARCHIVE="https://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VERSION}/compiler-rt-${CLANG_VERSION}.src.tar.xz" --CTE_ARCHIVE="https://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VERSION}/clang-tools-extra-${CLANG_VERSION}.src.tar.xz" --CMAKE_ARCHIVE="https://cmake.org/files/v3.18/cmake-${CMAKE_VERSION}.tar.gz" --NASM_ARCHIVE="https://www.nasm.us/pub/nasm/releasebuilds/${NASM_VERSION}/nasm-${NASM_VERSION}.tar.bz2" -+LLVM_ARCHIVE="http://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VERSION}/llvm-${CLANG_VERSION}.src.tar.xz" -+CLANG_ARCHIVE="http://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VERSION}/clang-${CLANG_VERSION}.src.tar.xz" -+CRT_ARCHIVE="http://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VERSION}/compiler-rt-${CLANG_VERSION}.src.tar.xz" -+CTE_ARCHIVE="http://github.com/llvm/llvm-project/releases/download/llvmorg-${CLANG_VERSION}/clang-tools-extra-${CLANG_VERSION}.src.tar.xz" -+CMAKE_ARCHIVE="http://cmake.org/files/v3.18/cmake-${CMAKE_VERSION}.tar.gz" -+NASM_ARCHIVE="http://www.nasm.us/pub/nasm/releasebuilds/${NASM_VERSION}/nasm-${NASM_VERSION}.tar.bz2" - - ALL_ARCHIVES="$GMP_ARCHIVE $MPFR_ARCHIVE $MPC_ARCHIVE \ - $GCC_ARCHIVE $BINUTILS_ARCHIVE $GDB_ARCHIVE $IASL_ARCHIVE \