[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 18/21] docker: add special handling for FROM:debi
From: |
Alex Bennée |
Subject: |
[Qemu-devel] [PATCH v2 18/21] docker: add special handling for FROM:debian-%-user targets |
Date: |
Fri, 29 Jun 2018 21:52:29 +0100 |
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 <address@hidden>
---
tests/docker/docker.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tests/docker/docker.py b/tests/docker/docker.py
index 388e86ada2..8ceaf78681 100755
--- a/tests/docker/docker.py
+++ b/tests/docker/docker.py
@@ -110,9 +110,13 @@ def _copy_binary_with_libs(src, dest_dir):
if libs:
for l in libs:
so_path = os.path.dirname(l)
- _copy_with_mkdir(l , dest_dir, so_path)
+ _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
- [Qemu-devel] [PATCH v2 02/21] travis: test out-of-tree builds, (continued)
- [Qemu-devel] [PATCH v2 02/21] travis: test out-of-tree builds, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 07/21] build-system: add clean-coverage target, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 08/21] build-system: add coverage-report target, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 10/21] linux-user: add gcov support to preexit_cleanup, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 21/21] .shippable.yml: add linux-user cross-build for ppc-softmmu, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 13/21] docker: ubuntu: Use SDL2, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 11/21] docker: filter out linux-user builds for mingw, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 12/21] docker: ubuntu: Update the package list before installing new ones, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 09/21] linux-user: introduce preexit_cleanup, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 16/21] docker: add env parser to docker.py build step, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 18/21] docker: add special handling for FROM:debian-%-user targets,
Alex Bennée <=
- [Qemu-devel] [PATCH v2 19/21] docker: add special rule for deboostrapped images, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 20/21] docker: add linux-user powered cross builder for QEMU, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 17/21] docker: drop QEMU build-dep from bootstrap, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 15/21] docker: Do not run tests in 'intermediate' images, Alex Bennée, 2018/06/29
- [Qemu-devel] [PATCH v2 14/21] docker: Clean the MXE base image, Alex Bennée, 2018/06/29