summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Roth <martinroth@google.com>2016-10-05 16:35:29 -0600
committerMartin Roth <martinroth@google.com>2016-10-07 18:18:47 +0200
commit1a9035988addfbe89ed708fe3c91bf6cc54befdb (patch)
treee1fb3fc363eeceadff603ce80db5b1df36aac373
parentdd78aa665a6d2148339506f73eaf6070a45da273 (diff)
util/release/build-release: Update tar command
Between GNU Tar 1.28 & 1.29, the files excluded by --exclude-vcs was updated. This breaks the reproducibility. Instead, just manually exclude the files to match what was excluded in v 1.28 and earlier. Change-Id: Ie0717891506f4a6d750ff264f9cc2494a296265b Signed-off-by: Martin Roth <martinroth@google.com> Reviewed-on: https://review.coreboot.org/16900 Tested-by: build bot (Jenkins) Reviewed-by: Philipp Deppenwiese <zaolin.daisuki@googlemail.com> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Reviewed-by: Patrick Georgi <pgeorgi@google.com>
-rwxr-xr-xutil/release/build-release4
1 files changed, 2 insertions, 2 deletions
diff --git a/util/release/build-release b/util/release/build-release
index 20fbfb60bc..895285e2e9 100755
--- a/util/release/build-release
+++ b/util/release/build-release
@@ -56,8 +56,8 @@ printf "%s-%s\n" "$VERSION_NAME" "$(git log --pretty=%H|head -1)" > .coreboot-v
tstamp=$(git log --pretty=format:%ci -1)
cd ..
-tar --sort=name --mtime="$tstamp" --owner=coreboot:1000 --group=coreboot:1000 --exclude-vcs --exclude="coreboot-${VERSION_NAME}/3rdparty/blobs" -cvf - "coreboot-${VERSION_NAME}" |xz -9 > "coreboot-${VERSION_NAME}.tar.xz"
-tar --sort=name --mtime="$tstamp" --owner=coreboot:1000 --group=coreboot:1000 --exclude-vcs -cvf - "coreboot-${VERSION_NAME}/3rdparty/blobs" |xz -9 > "coreboot-blobs-${VERSION_NAME}.tar.xz"
+tar --sort=name --mtime="$tstamp" --owner=coreboot:1000 --group=coreboot:1000 --exclude=*/.git --exclude=*/.gitignore --exclude="coreboot-${VERSION_NAME}/3rdparty/blobs" -cvf - "coreboot-${VERSION_NAME}" |xz -9 > "coreboot-${VERSION_NAME}.tar.xz"
+tar --sort=name --mtime="$tstamp" --owner=coreboot:1000 --group=coreboot:1000 --exclude=*/.git --exclude=*/.gitignore -cvf - "coreboot-${VERSION_NAME}/3rdparty/blobs" |xz -9 > "coreboot-blobs-${VERSION_NAME}.tar.xz"
if [ -n "${GPG_KEY_ID}" ]; then
gpg2 --armor --local-user "$GPG_KEY_ID" --output "coreboot-${VERSION_NAME}.tar.xz.sig" --detach-sig "coreboot-${VERSION_NAME}.tar.xz"