diff options
| author | Peter Maydell | 2019-05-03 13:51:02 +0200 |
|---|---|---|
| committer | Peter Maydell | 2019-05-03 13:51:02 +0200 |
| commit | 7c8cd3468a1500e503d0c262099f84cd1ecf274a (patch) | |
| tree | 68643e27c5fe700dd5f7a6bb6645a6ff09cb91e4 /scripts | |
| parent | Merge remote-tracking branch 'remotes/huth-gitlab/tags/pull-request-2019-05-0... (diff) | |
| parent | build-sys: move slirp as git submodule project (diff) | |
| download | qemu-7c8cd3468a1500e503d0c262099f84cd1ecf274a.tar.gz qemu-7c8cd3468a1500e503d0c262099f84cd1ecf274a.tar.xz qemu-7c8cd3468a1500e503d0c262099f84cd1ecf274a.zip | |
Merge remote-tracking branch 'remotes/thibault/tags/samuel-thibault' into staging
slirp: move slirp as git submodule project
Marc-André Lureau (2):
build-sys: pass CFLAGS & LDFLAGS to subdir-slirp
build-sys: move slirp as git submodule project
# gpg: Signature made Thu 02 May 2019 23:20:52 BST
# gpg: using RSA key E61DBB15D4172BDEC97E92D9DB550E89F0FA54F3
# gpg: Good signature from "Samuel Thibault <samuel.thibault@aquilenet.fr>" [unknown]
# gpg: aka "Samuel Thibault <sthibault@debian.org>" [marginal]
# gpg: aka "Samuel Thibault <samuel.thibault@gnu.org>" [unknown]
# gpg: aka "Samuel Thibault <samuel.thibault@inria.fr>" [marginal]
# gpg: aka "Samuel Thibault <samuel.thibault@labri.fr>" [marginal]
# gpg: aka "Samuel Thibault <samuel.thibault@ens-lyon.org>" [marginal]
# gpg: aka "Samuel Thibault <samuel.thibault@u-bordeaux.fr>" [unknown]
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 900C B024 B679 31D4 0F82 304B D017 8C76 7D06 9EE6
# Subkey fingerprint: E61D BB15 D417 2BDE C97E 92D9 DB55 0E89 F0FA 54F3
* remotes/thibault/tags/samuel-thibault:
build-sys: move slirp as git submodule project
build-sys: pass CFLAGS & LDFLAGS to subdir-slirp
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/archive-source.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh index d3a88f71e9..8b89948260 100755 --- a/scripts/archive-source.sh +++ b/scripts/archive-source.sh @@ -26,7 +26,7 @@ vroot_dir="${tar_file}.vroot" # independent of what the developer currently has initialized # in their checkout, because the build environment is completely # different to the host OS. -submodules="dtc ui/keycodemapdb tests/fp/berkeley-softfloat-3 tests/fp/berkeley-testfloat-3" +submodules="dtc slirp ui/keycodemapdb tests/fp/berkeley-softfloat-3 tests/fp/berkeley-testfloat-3" trap "status=$?; rm -rf \"$list_file\" \"$vroot_dir\"; exit \$status" 0 1 2 3 15 |