diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-05-03 12:51:02 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-05-03 12:51:02 +0100 |
| commit | 7c8cd3468a1500e503d0c262099f84cd1ecf274a (patch) | |
| tree | 68643e27c5fe700dd5f7a6bb6645a6ff09cb91e4 /.gitmodules | |
| parent | f62d632f4328fab02682335ba1ccfdbd9893d33d (diff) | |
| parent | 7c57bdd82026ba03f3158bbcd841afde7c2dc43a (diff) | |
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 '.gitmodules')
| -rw-r--r-- | .gitmodules | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules index ceafb0ee29..aa77ce6f50 100644 --- a/.gitmodules +++ b/.gitmodules @@ -52,3 +52,6 @@ [submodule "roms/edk2"] path = roms/edk2 url = https://github.com/tianocore/edk2.git +[submodule "slirp"] + path = slirp + url = https://gitlab.freedesktop.org/slirp/libslirp.git |