-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2 iQEcBAABCAAGBQJXpFVKAAoJEMo1YkxqkXHG6TIIAIPgHrfWNsiPxgZMuLwKGRYn eh9/x3Xb3pK5IqpVCdse4jvcH7LeKvQ0Q43dSpoeIOsrNskuKyo9TGgxMk6ehTSc 02HanVRF3ANasA+HU/F10q5hSyLcNkfQ+XhsSp/9RM+NX/7uh0Z7ee6qdZuNfBTi QSXhMm7XWc9q2p79+b09Lh7ezEOm/PYCKiVQ+H1BjcAZayO8zwu2Dk3X/vuhkoFg +zY6RWIbN0vvlNtI3zjvHbKNHgZkWlVAR/BWRWQd7XtjOaJ4pqNpZokyTaA8EMPj YoGvBYrFwNFlg0ird4H2DKsmPhj1fCQeEN98JY6p9ldgsb0Ocs3e4C/79QgoE3Y= =MPXN -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/famz/tags/docker-pull-request' into staging # gpg: Signature made Fri 05 Aug 2016 09:58:50 BST # gpg: using RSA key 0xCA35624C6A9171C6 # gpg: Good signature from "Fam Zheng <famz@redhat.com>" # gpg: WARNING: This key is not certified with a trusted signature! # gpg: There is no indication that the signature belongs to the owner. # Primary key fingerprint: 5003 7CB7 9706 0F76 F021 AD56 CA35 624C 6A91 71C6 * remotes/famz/tags/docker-pull-request: docker: Add "--enable-werror" to configure command line docker: Be compatible with older docker Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
commit
fbe400d246
|
@ -107,9 +107,8 @@ docker-run-%: docker-qemu-src
|
|||
fi
|
||||
$(if $(filter $(TESTS),$(CMD)),$(if $(filter $(IMAGES),$(IMAGE)), \
|
||||
$(call quiet-command,\
|
||||
if $(SRC_PATH)/tests/docker/docker.py images \
|
||||
--format={{.Repository}}:{{.Tag}} | \
|
||||
grep -qx qemu:$(IMAGE); then \
|
||||
if $(SRC_PATH)/tests/docker/docker.py images | \
|
||||
awk '$$1=="qemu" && $$2=="$(IMAGE)"{found=1} END{exit(!found)}'; then \
|
||||
$(SRC_PATH)/tests/docker/docker.py run $(if $V,,--rm) \
|
||||
-t \
|
||||
$(if $(DEBUG),-i,--net=none) \
|
||||
|
|
|
@ -24,6 +24,7 @@ requires()
|
|||
build_qemu()
|
||||
{
|
||||
$QEMU_SRC/configure \
|
||||
--enable-werror \
|
||||
${TARGET_LIST:+"--target-list=${TARGET_LIST}"} \
|
||||
--prefix="$PWD/install" \
|
||||
$EXTRA_CONFIGURE_OPTS \
|
||||
|
|
Loading…
Reference in a new issue