From 34bdffcbd2c1bab4178c19a5057cee2fc757a4a4 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Tue, 15 Jan 2019 11:16:08 -0500 Subject: [PATCH] packaging: Don't include checksums for libtool.m4 and configure These are more files that get mangled at `%configure` time. These two new ones specifically, I tripped on while building on ppc64le for RHEL7. See https://bugzilla.redhat.com/show_bug.cgi?id=1113618 for more info. Closes: #1731 Approved by: cgwalters --- packaging/make-git-snapshot.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/packaging/make-git-snapshot.sh b/packaging/make-git-snapshot.sh index 8e5e8975..9299847c 100755 --- a/packaging/make-git-snapshot.sh +++ b/packaging/make-git-snapshot.sh @@ -57,14 +57,13 @@ j = json.load(open(checksum_file)) j["files"] = {f:c for f, c in j["files"].items() if not f.startswith(subdir)} open(checksum_file, "w").write(json.dumps(j))' $crate_subdir done - # Also drop ltmain.sh and config.guess checksums since they get mangled by - # %configure. + # Also drop a couple of files that get mangled by %configure during hardening. for crate in backtrace-sys; do python -c ' import json, sys, os checksum_file = ("vendor/%s/.cargo-checksum.json" % sys.argv[1]) j = json.load(open(checksum_file)) -j["files"] = {f:c for f, c in j["files"].items() if os.path.basename(f) not in ["ltmain.sh", "config.guess", "config.sub"]} +j["files"] = {f:c for f, c in j["files"].items() if os.path.basename(f) not in ["ltmain.sh", "libtool.m4", "configure", "config.guess", "config.sub"]} open(checksum_file, "w").write(json.dumps(j))' $crate done tar --transform="s,^,${PKG_VER}/rust/," -rf ${TARFILE_TMP} * .cargo/