Revert "Revert "grub: build reproducibly""

This reverts commit 6278d578f6f47ae2d2742b95c99df087a06d0e90.

7 files changed, 27 insertions, 0 deletions

diff --git a/resources/scripts/helpers/build/release/docs b/resources/scripts/helpers/build/release/docs
index 966bccf..32203ac 100755
--- a/resources/scripts/helpers/build/release/docs
+++ b/resources/scripts/helpers/build/release/docs
@@ -28,9 +28,11 @@ printf 'Building the documentation release archive\n'
 if [ -f "version" ]; then
 	# _src release archive is being used
 	version="$(cat version)"
+	versiondate="$(cat versiondate)"
 else
 	# git repo is being used
 	version="$(git describe --tags HEAD)"
+	versiondate="$(git show -s --format=%ct)"
 fi
 versiondir="release/${version}"
 distname="libreboot_${version}_docs"
@@ -60,6 +62,8 @@ fi
 
 # include version information
 printf '%s\n' "${version}" >"${distdir}/version"
+# include version date information
+printf '%s\n' "${versiondate}" >"${distdir}/versiondate"
 
 printf 'Creating compressed documentation archive at %s\n' "${distdir}.tar.xz"
 (cd "${versiondir}/" && tar -c "${distname}/" | xz -9e >"${distname}.tar.xz")
diff --git a/resources/scripts/helpers/build/release/roms b/resources/scripts/helpers/build/release/roms
index e2ef74d..e39aca5 100755
--- a/resources/scripts/helpers/build/release/roms
+++ b/resources/scripts/helpers/build/release/roms
@@ -31,9 +31,11 @@ fi
 if [ -f "version" ]; then
 	# _src release archive is being used
 	version="$(cat version)"
+	versiondate="$(cat versiondate)"
 else
 	# git repo is being used
 	version="$(git describe --tags HEAD)"
+	versiondate="$(git show -s --format=%ct)"
 fi
 versiondir="release/${version}"
 romdir="${versiondir}/rom"
@@ -75,6 +77,8 @@ for payload in *; do
 
 		# Put the version string in the archive.
 		printf '%s\n' "${version}" >"${archivename}/version"
+		# Put the version date string in the archive
+		printf '%s\n' "${versiondate}" >"${archivename}/versiondate"
 
 		# Create the compressed archive.
 		tar -c "${archivename}/" | xz -9e >"../../${romdir}/${payload}/${archivename}.tar.xz"
diff --git a/resources/scripts/helpers/build/release/sha512sums b/resources/scripts/helpers/build/release/sha512sums
index 456764b..502f059 100755
--- a/resources/scripts/helpers/build/release/sha512sums
+++ b/resources/scripts/helpers/build/release/sha512sums
@@ -25,9 +25,11 @@ set -u -e
 if [ -f "version" ]; then
 	# _src release archive is being used
 	version="$(cat version)"
+	versiondate="$(cat versiondate)"
 else
 	# git repo is being used
 	version="$(git describe --tags HEAD)"
+	versiondate="$(git show -s --format=%ct)"
 fi
 versiondir="release/${version}"
 sha512filename="SHA512SUMS"
diff --git a/resources/scripts/helpers/build/release/src b/resources/scripts/helpers/build/release/src
index ed7ec68..294c3c2 100755
--- a/resources/scripts/helpers/build/release/src
+++ b/resources/scripts/helpers/build/release/src
@@ -28,9 +28,11 @@ printf 'Building the source release archive\n'
 if [ -f "version" ]; then
 	# _src release archive is being used
 	version="$(cat version)"
+	versiondate="$(cat versiondate)"
 else
 	# git repo is being used
 	version="$(git describe --tags HEAD)"
+	versiondate="$(git show -s --format=%ct)"
 fi
 versiondir="release/${version}"
 distname="libreboot_${version}_src"
@@ -65,6 +67,8 @@ fi
 
 # include version information
 printf '%s\n' "${version}" >"${distdir}/version"
+# include version date information
+printf '%s\n' "${versiondate}" >"${distdir}/versiondate"
 
 printf 'Cleaning files in %s/\n' "${distdir}"
 
diff --git a/resources/scripts/helpers/build/release/tobuild b/resources/scripts/helpers/build/release/tobuild
index da1b6d9..bc1f6dd 100755
--- a/resources/scripts/helpers/build/release/tobuild
+++ b/resources/scripts/helpers/build/release/tobuild
@@ -26,9 +26,11 @@ set -u -e
 if [ -f "version" ]; then
 	# _src release archive is being used
 	version="$(cat version)"
+	versiondate="$(cat versiondate)"
 else
 	# git repo is being used
 	version="$(git describe --tags HEAD)"
+	versiondate="$(git show -s --format=%ct)"
 fi
 versiondir="release/${version}"
 distname="libreboot_${version}_tobuild"
@@ -84,6 +86,8 @@ fi
 
 # include version information
 printf '%s\n' "${version}" >"${distdir}/version"
+# include version date information
+printf '%s\n' "${versiondate}" >"${distdir}/versiondate"
 
 # that is all. now tar it up
 (cd "${versiondir}/" && tar -c "${distname}/" | xz -9e >"${distname}.tar.xz")
diff --git a/resources/scripts/helpers/build/release/util b/resources/scripts/helpers/build/release/util
index 1a0d72f..3e9910d 100755
--- a/resources/scripts/helpers/build/release/util
+++ b/resources/scripts/helpers/build/release/util
@@ -44,9 +44,11 @@ fi
 if [ -f "version" ]; then
 	# _src release archive is being used
 	version="$(cat version)"
+	versiondate="$(cat versiondate)"
 else
 	# git repo is being used
 	version="$(git describe --tags HEAD)"
+	versiondate="$(git show -s --format=%ct)"
 fi
 versiondir="release/${version}"
 distname="libreboot_${version}_util"
@@ -76,6 +78,8 @@ fi
 
 # include version information
 printf '%s\n' "${version}" >"${distdir}/version"
+# include version date information
+printf '%s\n' "${versiondate}" >"${distdir}/versiondate"
 
 # --------------
 # BUC.TS related
diff --git a/resources/scripts/helpers/download/grub b/resources/scripts/helpers/download/grub
index 0012974..f823deb 100755
--- a/resources/scripts/helpers/download/grub
+++ b/resources/scripts/helpers/download/grub
@@ -58,5 +58,10 @@ git am "../resources/grub/patch/grub.johnlane.ie/0005-Cryptomount-support-for-hy
 # hotfix from kl3 (merged from autoboot) (ditto)
 git am "../resources/grub/patch/grub.johnlane.ie/0006-grub-core-disk-cryptodisk.c-Point-to-const-char.patch"
 
+# Needed for reproducible builds in GRUB
+git am "../resources/grub/patch/reproducible/"\[PATCH\ v3\ 1_3\]\ mkstandalone\:\ add\ argument\ --fixed-time\ to\ override\ mtime\ of\ files.eml
+git am "../resources/grub/patch/reproducible/"\[PATCH\ v3\ 2_3\]\ mkrescue\:\ add\ argument\ --fixed-time\ to\ get\ reproducible\ uuids.eml
+git am "../resources/grub/patch/reproducible/"\[PATCH\ v3\ 3_3\]\ Makefile_coreboot\ use\ SOURCE_DATE_EPOCH\ as\ time\ source\ if\ set.eml
+
 cd "../"
 printf "\n\n"