206ae24d4e
This bumps the requirement on the controlling host to Python 3 only. It also bumps the requirement on the target host to Python 3 as well since FCOS doesn't ship Python 2 right now. Though we'll need to eventually drop all Python usage anyway, but at least let's get tests passing on FCOS first. (See related previous patch). Closes: #1828 Approved by: cgwalters
79 lines
2.6 KiB
Bash
Executable File
79 lines
2.6 KiB
Bash
Executable File
#!/bin/sh
|
|
set -xeuo pipefail
|
|
|
|
srcdir=$1
|
|
shift
|
|
PKG_VER=$1
|
|
shift
|
|
GITREV=$1
|
|
shift
|
|
|
|
TARFILE=${PKG_VER}.tar
|
|
TARFILE_TMP=$(pwd)/${TARFILE}.tmp
|
|
|
|
test -n "${srcdir}"
|
|
test -n "${PKG_VER}"
|
|
test -n "${GITREV}"
|
|
|
|
TOP=$(git rev-parse --show-toplevel)
|
|
|
|
echo "Archiving ${PKG_VER} at ${GITREV} to ${TARFILE_TMP}"
|
|
(cd ${TOP}; git archive --format=tar --prefix=${PKG_VER}/ ${GITREV}) > ${TARFILE_TMP}
|
|
ls -al ${TARFILE_TMP}
|
|
(cd ${TOP}; git submodule status) | while read line; do
|
|
rev=$(echo ${line} | cut -f 1 -d ' '); path=$(echo ${line} | cut -f 2 -d ' ')
|
|
echo "Archiving ${path} at ${rev}"
|
|
(cd ${srcdir}/${path}; git archive --format=tar --prefix=${PKG_VER}/${path}/ ${rev}) > submodule.tar
|
|
tar -A -f ${TARFILE_TMP} submodule.tar
|
|
rm submodule.tar
|
|
done
|
|
tmpd=${TOP}/.dist-tmp
|
|
trap cleanup EXIT
|
|
function cleanup () {
|
|
if test -f ${tmpd}/.tmp; then
|
|
rm "${tmpd}" -rf
|
|
fi
|
|
}
|
|
# Run it now
|
|
cleanup
|
|
mkdir ${tmpd} && touch ${tmpd}/.tmp
|
|
|
|
(cd ${tmpd}
|
|
mkdir -p .cargo vendor
|
|
cargo vendor -q --sync ${TOP}/rust/Cargo.toml vendor
|
|
cp ${TOP}/rust/Cargo.lock .
|
|
cp ${TOP}/rust/cargo-vendor-config .cargo/config
|
|
# Filter out bundled libcurl and systemd; we always want the pkgconfig ones
|
|
for crate_subdir in curl-sys/curl \
|
|
libz-sys/src/zlib \
|
|
systemd/libsystemd-sys/systemd \
|
|
libsystemd-sys/systemd; do
|
|
rm -rf vendor/$crate_subdir
|
|
python3 -c '
|
|
import json, sys
|
|
crate, subdir = sys.argv[1].split("/", 1)
|
|
checksum_file = ("vendor/%s/.cargo-checksum.json" % crate)
|
|
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 a couple of files that get mangled by %configure during hardening.
|
|
for crate in backtrace-sys; do
|
|
python3 -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", "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/
|
|
)
|
|
|
|
# And finally, vendor rpmostree-rust.h; it's generated by cbindgen,
|
|
# and it's easier than vendoring all of the source for that too.
|
|
# This is currently the *only* generated file we treat this way. See also
|
|
# https://github.com/projectatomic/rpm-ostree/pull/1573
|
|
(cd ${srcdir} && tar --transform "s,^,${PKG_VER}/," -rf ${TARFILE_TMP} rpmostree-rust.h)
|
|
|
|
mv ${TARFILE_TMP} ${TARFILE}
|