From: "Alex Bennée" <alex.bennee@linaro.org>
To: qemu-devel@nongnu.org
Cc: fam@euphon.net, berrange@redhat.com, f4bug@amsat.org,
aurelien@aurel32.net, pbonzini@redhat.com, stefanha@redhat.com,
crosa@redhat.com, "Alex Bennée" <alex.bennee@linaro.org>
Subject: [PATCH v1 4/4] configure: expose the direct container command
Date: Tue, 11 Oct 2022 12:34:17 +0100 [thread overview]
Message-ID: <20221011113417.794841-5-alex.bennee@linaro.org> (raw)
In-Reply-To: <20221011113417.794841-1-alex.bennee@linaro.org>
In the process of migrating away from using docker.py to build our
containers we need to expose the command to the build environment. The
script is still a useful way to probe which command works though.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
configure | 3 +++
1 file changed, 3 insertions(+)
diff --git a/configure b/configure
index 45ee6f4eb3..5484ed2568 100755
--- a/configure
+++ b/configure
@@ -1778,6 +1778,7 @@ fi
# functions to probe cross compilers
container="no"
+runc=""
if test $use_containers = "yes"; then
case $($python "$source_path"/tests/docker/docker.py probe) in
*docker) container=docker ;;
@@ -1786,6 +1787,7 @@ if test $use_containers = "yes"; then
esac
if test "$container" != "no"; then
docker_py="$python $source_path/tests/docker/docker.py --engine $container"
+ runc=$($python "$source_path"/tests/docker/docker.py probe)
fi
fi
@@ -2380,6 +2382,7 @@ fi
if test "$container" != no; then
echo "ENGINE=$container" >> $config_host_mak
+ echo "RUNC=$runc" >> $config_host_mak
fi
echo "ROMS=$roms" >> $config_host_mak
echo "MAKE=$make" >> $config_host_mak
--
2.34.1
next prev parent reply other threads:[~2022-10-11 13:23 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-11 11:34 [PATCH v1 0/4] testing/next hotfix (revert bios build, mingw) Alex Bennée
2022-10-11 11:34 ` [PATCH v1 1/4] tests/docker: update fedora-win[32|64]-cross with lcitool Alex Bennée
2022-10-11 14:26 ` Stefan Hajnoczi
2022-10-11 16:53 ` Alex Bennée
2022-10-11 11:34 ` [PATCH v1 2/4] tests/docker: update test-mingw to run single build Alex Bennée
2022-10-11 11:34 ` [PATCH v1 3/4] Revert "configure: build ROMs with container-based cross compilers" Alex Bennée
2022-10-11 18:38 ` Daniel Henrique Barboza
2022-10-11 11:34 ` Alex Bennée [this message]
2022-10-11 18:58 ` [PATCH v1 0/4] testing/next hotfix (revert bios build, mingw) Stefan Hajnoczi
2022-10-11 19:29 ` Alex Bennée
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221011113417.794841-5-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=aurelien@aurel32.net \
--cc=berrange@redhat.com \
--cc=crosa@redhat.com \
--cc=f4bug@amsat.org \
--cc=fam@euphon.net \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).