aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Bennée <alex.bennee@linaro.org>2018-06-29 17:46:49 +0100
committerAlex Bennée <alex.bennee@linaro.org>2018-07-05 15:59:41 +0100
commit547cb45ea309dfdbaa8395dcc4c6330899118e56 (patch)
treed40f214ef68961d8e108e19bca0f3cb86df75c17
parent300cf467fd4f520a60d3eff7e73813337165dbcd (diff)
downloadqemu-arm-547cb45ea309dfdbaa8395dcc4c6330899118e56.tar.gz
docker: add special handling for FROM:debian-%-user targets
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> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
-rwxr-xr-xtests/docker/docker.py4
1 files changed, 4 insertions, 0 deletions
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()