mirror of
https://gitlab.com/qemu-project/qemu
synced 2024-10-15 23:43:55 +00:00
2019cabfee
Compared to submodules, .wrap files have several advantages:
* option parsing and downloading is delegated to meson
* the commit is stored in a text file instead of a magic entry in the
git tree object
* we could stop shipping external dependencies that are only used as a
fallback, but not break compilation on platforms that lack them.
For example it may make sense to download dtc at build time, controlled
by --enable-download, even when building from a tarball. Right now,
this patch does the opposite: make-release treats dtc like libvfio-user
(which is not stable API and therefore hasn't found its way into any
distros) and keycodemap (which is a copylib, for better or worse).
dependency() can fall back to a wrap automatically. However, this
is only possible for libraries that come with a .pc file, and this
is not very common for libfdt even though the upstream project in
principle provides it; it also removes the control that we provide with
--enable-fdt={system,internal}. Therefore, the logic to pick system
vs. internal libfdt is left untouched.
--enable-fdt=git is removed; it was already a synonym for
--enable-fdt=internal.
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
81 lines
2.4 KiB
Bash
Executable file
81 lines
2.4 KiB
Bash
Executable file
#!/bin/bash
|
|
#
|
|
# Author: Fam Zheng <famz@redhat.com>
|
|
#
|
|
# Archive source tree, including submodules. This is created for test code to
|
|
# export the source files, in order to be built in a different environment,
|
|
# such as in a docker instance or VM.
|
|
#
|
|
# This code is licensed under the GPL version 2 or later. See
|
|
# the COPYING file in the top-level directory.
|
|
|
|
error() {
|
|
printf %s\\n "$*" >&2
|
|
exit 1
|
|
}
|
|
|
|
if test $# -lt 1; then
|
|
error "Usage: $0 <output tarball>"
|
|
fi
|
|
|
|
tar_file=$(realpath "$1")
|
|
sub_tdir=$(mktemp -d "${tar_file%.tar}.sub.XXXXXXXX")
|
|
sub_file="${sub_tdir}/submodule.tar"
|
|
|
|
# We want a predictable list of submodules for builds, that is
|
|
# independent of what the developer currently has initialized
|
|
# in their checkout, because the build environment is completely
|
|
# different to the host OS.
|
|
subprojects="dtc keycodemapdb libvfio-user"
|
|
submodules="tests/fp/berkeley-softfloat-3 tests/fp/berkeley-testfloat-3"
|
|
sub_deinit=""
|
|
|
|
function cleanup() {
|
|
local status=$?
|
|
rm -rf "$sub_tdir"
|
|
if test "$sub_deinit" != ""; then
|
|
git submodule deinit $sub_deinit
|
|
fi
|
|
exit $status
|
|
}
|
|
trap "cleanup" 0 1 2 3 15
|
|
|
|
function tree_ish() {
|
|
local retval='HEAD'
|
|
if ! git diff-index --quiet --ignore-submodules=all HEAD -- &>/dev/null
|
|
then
|
|
retval=$(git stash create)
|
|
fi
|
|
echo "$retval"
|
|
}
|
|
|
|
git archive --format tar "$(tree_ish)" > "$tar_file"
|
|
test $? -ne 0 && error "failed to archive qemu"
|
|
for sm in $submodules; do
|
|
status="$(git submodule status "$sm")"
|
|
smhash="${status#[ +-]}"
|
|
smhash="${smhash%% *}"
|
|
case "$status" in
|
|
-*)
|
|
sub_deinit="$sub_deinit $sm"
|
|
git submodule update --init "$sm"
|
|
test $? -ne 0 && error "failed to update submodule $sm"
|
|
;;
|
|
+*)
|
|
echo "WARNING: submodule $sm is out of sync"
|
|
;;
|
|
esac
|
|
(cd $sm; git archive --format tar --prefix "$sm/" $(tree_ish)) > "$sub_file"
|
|
test $? -ne 0 && error "failed to archive submodule $sm ($smhash)"
|
|
tar --concatenate --file "$tar_file" "$sub_file"
|
|
test $? -ne 0 && error "failed append submodule $sm to $tar_file"
|
|
done
|
|
|
|
for sp in $subprojects; do
|
|
meson subprojects download $sp
|
|
test $? -ne 0 && error "failed to download subproject $sp"
|
|
tar --append --file "$tar_file" --exclude=.git subprojects/$sp
|
|
test $? -ne 0 && error "failed to append subproject $sp to $tar_file"
|
|
done
|
|
exit 0
|