diff options
author | Alex Bennée <alex.bennee@linaro.org> | 2023-10-09 17:40:44 +0100 |
---|---|---|
committer | Alex Bennée <alex.bennee@linaro.org> | 2023-10-11 08:46:33 +0100 |
commit | c6919250921c4794f4029bfe3f9f1c5263328899 (patch) | |
tree | ccf61afc7165078b4a1db38bb0d297fcc92f4a85 /configure | |
parent | 78ebc00b068131d2e3c0f8e66c0ded3fadb248d0 (diff) | |
download | qemu-c6919250921c4794f4029bfe3f9f1c5263328899.zip qemu-c6919250921c4794f4029bfe3f9f1c5263328899.tar.gz qemu-c6919250921c4794f4029bfe3f9f1c5263328899.tar.bz2 |
tests/docker: make docker engine choice entirely configure driven
Since 0b1a649047 (tests/docker: use direct RUNC call to build
containers) we ended up with the potential for the remaining docker.py
script calls to deviate from the direct RUNC calls. Fix this by
dropping the use of ENGINE in the makefile and rely entirely on what
we detect at configure time.
We also tweak the RUNC detection so podman users can still run things
from the source tree.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-Id: <20231009164104.369749-6-alex.bennee@linaro.org>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -1694,7 +1694,6 @@ if test -n "$gdb_bin"; then fi if test "$container" != no; then - echo "ENGINE=$container" >> $config_host_mak echo "RUNC=$runc" >> $config_host_mak fi echo "SUBDIRS=$subdirs" >> $config_host_mak |