From: "Alex Bennée" <alex.bennee@linaro.org>
To: cota@braap.org, famz@redhat.com, berrange@redhat.com,
f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com,
aurelien@aurel32.net, agraf@suse.de
Cc: pbonzini@redhat.com, qemu-devel@nongnu.org,
"Alex Bennée" <alex.bennee@linaro.org>
Subject: [Qemu-devel] [PATCH v3 18/20] docker: add special handling for FROM:debian-%-user targets
Date: Mon, 2 Jul 2018 15:30:19 +0100 [thread overview]
Message-ID: <20180702143021.18864-19-alex.bennee@linaro.org> (raw)
In-Reply-To: <20180702143021.18864-1-alex.bennee@linaro.org>
These will have been build with debootstrap so we need to check
against the debian-bootstrap dockerfile. This does mean sticking to
debian-FOO-user as the naming conventions for boot-strapped images.
The actual cross image is built on top.
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
v3
- don't include stray whitespace fix
---
tests/docker/docker.py | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index b279836154..69e7130db7 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -113,6 +113,10 @@ def _copy_binary_with_libs(src, dest_dir):
_copy_with_mkdir(l , dest_dir, so_path)
def _read_qemu_dockerfile(img_name):
+ # special case for Debian linux-user images
+ if img_name.startswith("debian") and img_name.endswith("user"):
+ img_name = "debian-bootstrap"
+
df = os.path.join(os.path.dirname(__file__), "dockerfiles",
img_name + ".docker")
return open(df, "r").read()
--
2.17.1
next prev parent reply other threads:[~2018-07-02 14:38 UTC|newest]
Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-02 14:30 [Qemu-devel] [PATCH v3 00/20] Travis, Code Coverage and Cross Build updates Alex Bennée
2018-07-02 14:30 ` [Qemu-devel] [PATCH v3 01/20] travis: do not waste time cloning unused submodules Alex Bennée
2018-07-02 14:30 ` [Qemu-devel] [PATCH v3 02/20] travis: test out-of-tree builds Alex Bennée
2018-07-02 14:30 ` [Qemu-devel] [PATCH v3 03/20] build-system: remove per-test GCOV reporting Alex Bennée
2018-07-02 14:30 ` [Qemu-devel] [PATCH v3 04/20] .gitignore: add .gcov files Alex Bennée
2018-07-02 14:30 ` [Qemu-devel] [PATCH v3 05/20] docker: add gcovr to travis image Alex Bennée
2018-07-02 14:30 ` [Qemu-devel] [PATCH v3 06/20] travis: add gcovr summary for GCOV build Alex Bennée
2018-07-02 14:30 ` [Qemu-devel] [PATCH v3 07/20] build-system: add clean-coverage target Alex Bennée
2018-07-02 15:45 ` Philippe Mathieu-Daudé
2018-07-02 14:30 ` [Qemu-devel] [PATCH v3 08/20] build-system: add coverage-report target Alex Bennée
2018-07-02 14:30 ` [Qemu-devel] [PATCH v3 09/20] linux-user: introduce preexit_cleanup Alex Bennée
2018-07-02 16:22 ` Philippe Mathieu-Daudé
2018-07-02 16:30 ` Philippe Mathieu-Daudé
2018-07-02 17:59 ` Alex Bennée
2018-07-02 14:30 ` [Qemu-devel] [PATCH v3 10/20] linux-user: add gcov support to preexit_cleanup Alex Bennée
2018-07-02 14:30 ` [Qemu-devel] [PATCH v3 11/20] docker: filter out linux-user builds for mingw Alex Bennée
2018-07-02 14:30 ` [Qemu-devel] [PATCH v3 12/20] docker: ubuntu: Update the package list before installing new ones Alex Bennée
2018-07-02 14:30 ` [Qemu-devel] [PATCH v3 13/20] docker: ubuntu: Use SDL2 Alex Bennée
2018-07-02 14:30 ` [Qemu-devel] [PATCH v3 14/20] docker: Clean the MXE base image Alex Bennée
2018-07-02 14:30 ` [Qemu-devel] [PATCH v3 15/20] docker: Do not run tests in 'intermediate' images Alex Bennée
2018-07-02 14:30 ` [Qemu-devel] [PATCH v3 16/20] docker: drop QEMU build-dep from bootstrap Alex Bennée
2018-07-02 20:20 ` Philippe Mathieu-Daudé
2018-07-02 14:30 ` [Qemu-devel] [PATCH v3 17/20] docker: debian-bootstrap.pre allow customising of variant/url Alex Bennée
2018-07-02 20:20 ` Philippe Mathieu-Daudé
2018-07-02 14:30 ` Alex Bennée [this message]
2018-07-02 20:21 ` [Qemu-devel] [PATCH v3 18/20] docker: add special handling for FROM:debian-%-user targets Philippe Mathieu-Daudé
2018-07-02 14:30 ` [Qemu-devel] [PATCH v3 19/20] docker: add special rule for deboostrapped images Alex Bennée
2018-07-02 20:32 ` Philippe Mathieu-Daudé
2018-07-02 14:30 ` [Qemu-devel] [PATCH v3 20/20] docker: add linux-user powered cross builder for QEMU Alex Bennée
2018-07-02 20:35 ` Philippe Mathieu-Daudé
2018-07-02 23:50 ` Philippe Mathieu-Daudé
2018-07-02 19:20 ` [Qemu-devel] [PATCH v3 00/20] Travis, Code Coverage and Cross Build updates no-reply
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=20180702143021.18864-19-alex.bennee@linaro.org \
--to=alex.bennee@linaro.org \
--cc=agraf@suse.de \
--cc=aurelien@aurel32.net \
--cc=balrogg@gmail.com \
--cc=berrange@redhat.com \
--cc=cota@braap.org \
--cc=f4bug@amsat.org \
--cc=famz@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
/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).