From 6278d578f6f47ae2d2742b95c99df087a06d0e90 Mon Sep 17 00:00:00 2001 From: Francis Rowe Date: Fri, 4 Dec 2015 19:17:38 +0000 Subject: Revert "grub: build reproducibly" This reverts commit 26d16fa5cdc9e351fcb582104cf8c7b3bf9ddaf0. --- resources/scripts/helpers/build/release/docs | 4 ---- resources/scripts/helpers/build/release/roms | 4 ---- resources/scripts/helpers/build/release/sha512sums | 2 -- resources/scripts/helpers/build/release/src | 4 ---- resources/scripts/helpers/build/release/tobuild | 4 ---- resources/scripts/helpers/build/release/util | 4 ---- resources/scripts/helpers/download/grub | 5 ----- 7 files changed, 27 deletions(-) (limited to 'resources/scripts') diff --git a/resources/scripts/helpers/build/release/docs b/resources/scripts/helpers/build/release/docs index 32203ac4..966bccf0 100755 --- a/resources/scripts/helpers/build/release/docs +++ b/resources/scripts/helpers/build/release/docs @@ -28,11 +28,9 @@ 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" @@ -62,8 +60,6 @@ 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 e39aca5d..e2ef74d5 100755 --- a/resources/scripts/helpers/build/release/roms +++ b/resources/scripts/helpers/build/release/roms @@ -31,11 +31,9 @@ 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" @@ -77,8 +75,6 @@ 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 502f0591..456764b5 100755 --- a/resources/scripts/helpers/build/release/sha512sums +++ b/resources/scripts/helpers/build/release/sha512sums @@ -25,11 +25,9 @@ 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 294c3c20..ed7ec680 100755 --- a/resources/scripts/helpers/build/release/src +++ b/resources/scripts/helpers/build/release/src @@ -28,11 +28,9 @@ 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" @@ -67,8 +65,6 @@ 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 bc1f6dd8..da1b6d94 100755 --- a/resources/scripts/helpers/build/release/tobuild +++ b/resources/scripts/helpers/build/release/tobuild @@ -26,11 +26,9 @@ 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" @@ -86,8 +84,6 @@ 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 3e9910d9..1a0d72f4 100755 --- a/resources/scripts/helpers/build/release/util +++ b/resources/scripts/helpers/build/release/util @@ -44,11 +44,9 @@ 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" @@ -78,8 +76,6 @@ 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 f823debd..00129743 100755 --- a/resources/scripts/helpers/download/grub +++ b/resources/scripts/helpers/download/grub @@ -58,10 +58,5 @@ 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" -- cgit v1.2.3-70-g09d2