diff options
| author | Leah Rowe <leah@libreboot.org> | 2023-10-14 04:37:14 +0100 |
|---|---|---|
| committer | Leah Rowe <leah@libreboot.org> | 2023-10-14 05:04:28 +0100 |
| commit | e0feda639b0112bd6a40e4caee168ea3b82b10e4 (patch) | |
| tree | 1070173c3327f8619ebbae9303520440056ed19f /script/update/project | |
| parent | ec0b38afb3cad36e7eb8f8d2d2d5f6f027a9a290 (diff) | |
update/release: fix/simplify mtime handling
i wasn't getting the very first line of tar --version,
so it wasn't doing the check properly.
further sort the files by name within the tar archive.
for reliability, don't bother using versiondate anymore:
set a *fixed* date, and fixed timezone, to ensure
that it works reliably for reproducible tarball creation.
Signed-off-by: Leah Rowe <leah@libreboot.org>
Diffstat (limited to 'script/update/project')
| -rwxr-xr-x | script/update/project/release | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/script/update/project/release b/script/update/project/release index a8447893..5e160f6a 100755 --- a/script/update/project/release +++ b/script/update/project/release @@ -8,7 +8,7 @@ set -u -e . "include/err.sh" eval "$(setvars "" vdir basename src_dirname srcdir _nogit _xm target romdir \ - microcode_required CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN mode \ + microcode_required CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN mode mtime \ CONFIG_KBC1126_FIRMWARE CONFIG_INCLUDE_SMSC_SCH5545_EC_FW)" _f="coreboot u-boot seabios flashrom grub memtest86plus uefitool" @@ -230,27 +230,17 @@ insert_version_files() mktarball() { # preserve timestamps for reproducible tarballs - touch_implementation="$(touch --version)" - tar_implementation="$(tar --version)" - eval "$(setvars "" mtime touch)" - [ "${tar_implementation% *}" = "tar (GNU tar)" ] && \ - mtime="--mtime='@${versiondate}'" - [ "${touch_implementation% *}" = "touch (GNU coreutils)" ] || \ - touch_implementation="" - - ( - x_ cd "${1}" - [ -z "${touch_implementation}" ] || \ - find . -exec touch -h -a -m \ - -d "$(date -Rd @${versiondate})" {} + || \ - err "mktarball ${1}: can't set universal timestamps" - ) - [ -z "${touch_implementation}" ] || \ - touch -h -a -m -d "$(date -Rd @${versiondate})" "${1}" || \ - err "mktarball ${1}: can't set timestamp on ${1}" + tar_implementation=$(tar --version | head -n1) || : [ "${2%/*}" = "${2}" ] || x_ mkdir -p "${2%/*}" - x_ tar -c "${1}" ${mtime} | xz -T0 -9e > "${2}" + if [ "${tar_implementation% *}" = "tar (GNU tar)" ]; then + tar --sort=name --owner=root:0 --group=root:0 \ + --mtime="UTC 2023-10-14" -c "${1}" | xz -T0 -9e > "${2}" || \ + err "mktarball 1, ${1}" + else + # TODO: reproducible tarballs on non-GNU systems + tar -c "${1}" | xz -T0 -9e > "${2}" || err "mktarball 2, ${1}" + fi ( [ "${2%/*}" != "${2}" ] && x_ cd "${2%/*}" x_ sha512sum "${2##*/}" > "${2##*/}.sha512" |