keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

packaging: Don't include checksums for libtool.m4 and configure

Browse Source 
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
This commit is contained in:
Jonathan Lebon 2019-01-15 11:16:08 -05:00 committed by Atomic Bot
parent a20d10e3d5
commit 34bdffcbd2
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packaging/make-git-snapshot.sh
View File

@ -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)} 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 open(checksum_file, "w").write(json.dumps(j))' $crate_subdir
done done
# Also drop ltmain.sh and config.guess checksums since they get mangled by # Also drop a couple of files that get mangled by %configure during hardening.
# %configure.
for crate in backtrace-sys; do for crate in backtrace-sys; do
python -c ' python -c '
import json, sys, os import json, sys, os
checksum_file = ("vendor/%s/.cargo-checksum.json" % sys.argv[1]) checksum_file = ("vendor/%s/.cargo-checksum.json" % sys.argv[1])
j = json.load(open(checksum_file)) 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 open(checksum_file, "w").write(json.dumps(j))' $crate
done done
tar --transform="s,^,${PKG_VER}/rust/," -rf ${TARFILE_TMP} * .cargo/ tar --transform="s,^,${PKG_VER}/rust/," -rf ${TARFILE_TMP} * .cargo/