diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-06-05 17:06:23 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-06-05 17:06:23 +0100 |
| commit | c1c2a435905ae76b159c573b0c0d6f095b45ebc6 (patch) | |
| tree | cb8ccfb20c3397cade36263c3fbde7955f52f6b7 /scripts | |
| parent | 1d889f2a8baaa265939b339d2f52ec57f5b8a09c (diff) | |
| parent | 36dc5fedab0339afdeb3c40ff820c7e5ce334751 (diff) | |
| download | qemu-c1c2a435905ae76b159c573b0c0d6f095b45ebc6.zip qemu-c1c2a435905ae76b159c573b0c0d6f095b45ebc6.tar.gz qemu-c1c2a435905ae76b159c573b0c0d6f095b45ebc6.tar.bz2 | |
Merge remote-tracking branch 'remotes/stsquad/tags/pull-docker-updates-050618-1' into staging
Docker related updates
- configure/probe for docker
- TARGET_DIRS -> TARGET_LIST cleanup
- new fedora-i386-cross and debian/tricore images
- test-mingw use SDL2/GTK3
# gpg: Signature made Tue 05 Jun 2018 16:32:53 BST
# gpg: using RSA key FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>"
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8 DF35 FBD0 DB09 5A9E 2A44
* remotes/stsquad/tags/pull-docker-updates-050618-1:
docker: add debian/tricore image
docker: test-mingw: use SDL2 and GTK+3
docker: Add fedora-i386-cross image
Makefile: Rename TARGET_DIRS to TARGET_LIST
configure: add test for docker availability
docker: add "probe" command for configure
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/create_config | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/create_config b/scripts/create_config index d727e5e..58948a6 100755 --- a/scripts/create_config +++ b/scripts/create_config @@ -107,7 +107,7 @@ case $line in target_name=${line#*=} echo "#define TARGET_NAME \"$target_name\"" ;; - TARGET_DIRS=*) + TARGET_LIST=*) # do nothing ;; TARGET_*=y) # configuration |