aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé <f4bug@amsat.org>2017-10-31 09:28:24 -0300
committerAlex Bennée <alex.bennee@linaro.org>2017-11-02 11:46:41 +0000
commite58c1f9b35e81dec90c3d483b57351256cecfc41 (patch)
treead5dd32f9d449ed92d8552c9f2faedb0ed3c6cb7
parentd2b9d71432687eef947f243a57409381151701d5 (diff)
downloadqemu-e58c1f9b35e81dec90c3d483b57351256cecfc41.zip
qemu-e58c1f9b35e81dec90c3d483b57351256cecfc41.tar.gz
qemu-e58c1f9b35e81dec90c3d483b57351256cecfc41.tar.bz2
docker: add python stdlib dependency (required by keycodemapdb)
Since 927128222b0a QEMU depends of keycodemapdb, which uses the python 'csv' module from stdlib to parse keymaps.csv. Without this package the build fails: GEN ui/input-keymap-linux-to-qcode.c Traceback (most recent call last): File "ui/keycodemapdb/tools/keymap-gen", line 15, in <module> import csv ImportError: No module named csv GEN ui/input-keymap-qcode-to-qnum.c Traceback (most recent call last): File "ui/keycodemapdb/tools/keymap-gen", line 15, in <module> import csv ImportError: No module named csv [...] CC ui/input-keymap.o ui/input-keymap.c:8:44: fatal error: ui/input-keymap-linux-to-qcode.c: No such file or directory make: *** [ui/input-keymap.o] Error 1 Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
-rw-r--r--tests/docker/dockerfiles/debian8-mxe.docker1
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/docker/dockerfiles/debian8-mxe.docker b/tests/docker/dockerfiles/debian8-mxe.docker
index 7bf1b59..9b8e577 100644
--- a/tests/docker/dockerfiles/debian8-mxe.docker
+++ b/tests/docker/dockerfiles/debian8-mxe.docker
@@ -13,6 +13,7 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys D43A795B73B16ABE964
RUN apt-get update
RUN DEBIAN_FRONTEND=noninteractive eatmydata \
apt-get install -y --no-install-recommends \
+ libpython2.7-stdlib \
$(apt-get -s install -y --no-install-recommends gw32.shared-mingw-w64 gw32.shared-mingw-w64 | egrep "^Inst mxe-x86-64-unknown-" | cut -d\ -f2)
ENV PATH $PATH:/usr/lib/mxe/usr/bin/