diff options
| -rwxr-xr-x | libreboot | 10 | ||||
| -rw-r--r-- | projects/coreboot/configs/revision | 2 | ||||
| -rw-r--r-- | projects/coreboot/patches/0001-Don-t-pull-in-3rdparty-git-submodules.patch (renamed from projects/coreboot/patches/0001-Avoid-using-git-submodules-for-3rdparty.patch) | 42 | ||||
| -rwxr-xr-x | projects/crossgcc/crossgcc | 2 | ||||
| l--------- | projects/crossgcc/patches/0001-Avoid-using-git-submodules-for-3rdparty.patch | 1 | ||||
| l--------- | projects/crossgcc/patches/0001-Don-t-pull-in-3rdparty-git-submodules.patch | 1 |
6 files changed, 32 insertions, 26 deletions
@@ -63,7 +63,7 @@ libreboot_usage() { printf 1>&2 '%s\n' ' TOOLS_FORCE - Tools to always perform actions for' printf 1>&2 '%s\n' ' RELEASE_KEY - GPG key to use for release' printf 1>&2 '%s\n' ' VBOOT_KEYS_PATH - Path to the vboot keys' - printf 1>&2 '%s\n' ' LIBFAKETIME_PATH - Path to the libfaketime shared library' + printf 1>&2 '%s\n' ' LIBFAKETIME_PATH - Path to libfaketime' printf 1>&2 '%s\n' ' TASKS - Number of simultaneous tasks to run' printf 1>&2 '%s\n' ' VERSION - Version string to use' @@ -220,6 +220,8 @@ libreboot_setup_reproducible_builds_variables() { else RANDOM_SEED="$RANDOM" # True randomness is unnecessary fi + + export RANDOM_SEED fi # Also used by GCC, but as an environment variable @@ -231,9 +233,11 @@ libreboot_setup_reproducible_builds_variables() { else SOURCE_DATE_EPOCH="$(date +%s)" fi + + export SOURCE_DATE_EPOCH fi - # Relevant only when libfaketime is preloaded + # Relevant only when libfaketime path is given in $BUILD_SYSTEM.conf if [[ -n "$LIBFAKETIME_PATH" ]]; then BUILD_DATE_FMT="%Y-%m-%d %H:%M:%S" BUILD_DATE="$(date -u -d "@$SOURCE_DATE_EPOCH" "+$BUILD_DATE_FMT" 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" "+$BUILD_DATE_FMT" 2>/dev/null || date -u "+$BUILD_DATE_FMT")" @@ -241,6 +245,8 @@ libreboot_setup_reproducible_builds_variables() { LC_ALL='C.UTF-8' LD_PRELOAD="$LIBFAKETIME_PATH" TZ='UTC' + + export BUILD_DATE_FMT BUILD_DATE FAKETIME LC_ALL LD_PRELOAD TZ fi } diff --git a/projects/coreboot/configs/revision b/projects/coreboot/configs/revision index 24940261..30357a1c 100644 --- a/projects/coreboot/configs/revision +++ b/projects/coreboot/configs/revision @@ -1 +1 @@ -a17796e6012041e2d8ebe16b0bde0b99809ee87c +8f560d9b9c20c7e72b031e60cf0e828d7d27ec8e diff --git a/projects/coreboot/patches/0001-Avoid-using-git-submodules-for-3rdparty.patch b/projects/coreboot/patches/0001-Don-t-pull-in-3rdparty-git-submodules.patch index 24964bb4..ddba7bc3 100644 --- a/projects/coreboot/patches/0001-Avoid-using-git-submodules-for-3rdparty.patch +++ b/projects/coreboot/patches/0001-Don-t-pull-in-3rdparty-git-submodules.patch @@ -1,10 +1,10 @@ -From b403ddd709578d11f1e6d32abfc94701f57cae16 Mon Sep 17 00:00:00 2001 -From: Paul Kocialkowski <contact@paulk.fr> -Date: Thu, 25 Jan 2018 17:31:55 -0500 -Subject: [PATCH] Avoid using git submodules for 3rdparty +From 8b436fdcc99f111e17cd98da6d60a4d6977241e6 Mon Sep 17 00:00:00 2001 +From: Andrew Robbins <contact@andrewrobbins.info> +Date: Fri, 7 Dec 2018 21:59:21 -0500 +Subject: [PATCH] Don't pull in 3rdparty git submodules -This gets rid of git submodules entirely, to avoid the nuisance caused -by automatically checking them out. +Libreboot's build system uses separate git repositories for the +third-party software. --- .gitmodules | 20 -------------------- 3rdparty/arm-trusted-firmware | 1 - @@ -52,51 +52,51 @@ index c3270e6..3a617c7 100644 - url = ../libgfxinit.git diff --git a/3rdparty/arm-trusted-firmware b/3rdparty/arm-trusted-firmware deleted file mode 160000 -index b118723..0000000 +index 693e278..0000000 --- a/3rdparty/arm-trusted-firmware +++ /dev/null @@ -1 +0,0 @@ --Subproject commit b1187232fdf819586ba8c8ece4a27a7515cbdc6d +-Subproject commit 693e278e308441d716f7f5116c43aa150955da31 diff --git a/3rdparty/blobs b/3rdparty/blobs deleted file mode 160000 -index 8eb92ba..0000000 +index 372012e..0000000 --- a/3rdparty/blobs +++ /dev/null @@ -1 +0,0 @@ --Subproject commit 8eb92ba947e171df11b3c62f5f257ce69b9e2d55 +-Subproject commit 372012e8e1d0d01f3e77ff73b118665b41ff68b6 diff --git a/3rdparty/chromeec b/3rdparty/chromeec deleted file mode 160000 -index 9fb1038..0000000 +index 11bd4c0..0000000 --- a/3rdparty/chromeec +++ /dev/null @@ -1 +0,0 @@ --Subproject commit 9fb10386a720d270e37ce61da3ff3a6d5a69951e +-Subproject commit 11bd4c0f4d11357ab830982d7dec164813c886dd diff --git a/3rdparty/libgfxinit b/3rdparty/libgfxinit deleted file mode 160000 -index 42fb2d0..0000000 +index 718c79b..0000000 --- a/3rdparty/libgfxinit +++ /dev/null @@ -1 +0,0 @@ --Subproject commit 42fb2d065d604eb08c723ac6b96aeebb4c84cbd3 +-Subproject commit 718c79bb0713b5b90c9cc44e03197dc777066e3d diff --git a/3rdparty/libhwbase b/3rdparty/libhwbase deleted file mode 160000 -index 6685971..0000000 +index 637f2a4..0000000 --- a/3rdparty/libhwbase +++ /dev/null @@ -1 +0,0 @@ --Subproject commit 66859712e4817288591908d737dbf41ddea31c3a +-Subproject commit 637f2a4f21ead8ccc45d5256834eb27ce72088db diff --git a/3rdparty/vboot b/3rdparty/vboot deleted file mode 160000 -index f6780a3..0000000 +index 392211f..0000000 --- a/3rdparty/vboot +++ /dev/null @@ -1 +0,0 @@ --Subproject commit f6780a36ff19b36abcdb5ace903c4ae2272fb574 +-Subproject commit 392211f0358919d510179ad399d8f056180e652e diff --git a/Makefile.inc b/Makefile.inc -index 413f7ad..ed2d839 100644 +index 3840505..da567de 100644 --- a/Makefile.inc +++ b/Makefile.inc -@@ -191,18 +191,6 @@ ifeq ($(CONFIG_COVERAGE),y) +@@ -188,18 +188,6 @@ ifeq ($(CONFIG_COVERAGE),y) ramstage-c-ccopts += -fprofile-arcs -ftest-coverage endif @@ -116,5 +116,5 @@ index 413f7ad..ed2d839 100644 ramstage-c-deps:=$$(OPTION_TABLE_H) romstage-c-deps:=$$(OPTION_TABLE_H) -- -1.9.1 +2.7.4 diff --git a/projects/crossgcc/crossgcc b/projects/crossgcc/crossgcc index 46b9e3f3..1c3f33d8 100755 --- a/projects/crossgcc/crossgcc +++ b/projects/crossgcc/crossgcc @@ -157,7 +157,7 @@ build() { bootstrap_flag='-b' fi - make -C "$sources_path" "$bootstrap_flag" CPUS="$TASKS" DEST="$build_path" "crossgcc-$arch" + make -C "$sources_path" $bootstrap_flag CPUS="$TASKS" DEST="$build_path" "crossgcc-$arch" } build_check() { diff --git a/projects/crossgcc/patches/0001-Avoid-using-git-submodules-for-3rdparty.patch b/projects/crossgcc/patches/0001-Avoid-using-git-submodules-for-3rdparty.patch deleted file mode 120000 index 627443a5..00000000 --- a/projects/crossgcc/patches/0001-Avoid-using-git-submodules-for-3rdparty.patch +++ /dev/null @@ -1 +0,0 @@ -../../coreboot/patches/0001-Avoid-using-git-submodules-for-3rdparty.patch
\ No newline at end of file diff --git a/projects/crossgcc/patches/0001-Don-t-pull-in-3rdparty-git-submodules.patch b/projects/crossgcc/patches/0001-Don-t-pull-in-3rdparty-git-submodules.patch new file mode 120000 index 00000000..250b848b --- /dev/null +++ b/projects/crossgcc/patches/0001-Don-t-pull-in-3rdparty-git-submodules.patch @@ -0,0 +1 @@ +../../coreboot/patches/0001-Don-t-pull-in-3rdparty-git-submodules.patch
\ No newline at end of file |