The following changes since commit d2b9d71432687eef947f243a57409381151701d5:

  Merge remote-tracking branch 'remotes/dgilbert/tags/pull-hmp-20171030' into staging (2017-10-31 11:18:00 +0000)

are available in the git repository at:

  https://github.com/stsquad/qemu.git tags/pull-ci-updates-for-softfreeze-021117-2

for you to fetch changes up to e58c1f9b35e81dec90c3d483b57351256cecfc41:

  docker: add python stdlib dependency (required by keycodemapdb) (2017-11-02 11:46:41 +0000)

----------------------------------------------------------------
One fix for win32/64 cross compiles.

----------------------------------------------------------------
Philippe Mathieu-Daudé (1):
      docker: add python stdlib dependency (required by keycodemapdb)

 tests/docker/dockerfiles/debian8-mxe.docker | 1 +
 1 file changed, 1 insertion(+)

--
2.14.2

On 2 November 2017 at 14:40, Alex Bennée <alex.bennee@linaro.org> wrote:
> The following changes since commit d2b9d71432687eef947f243a57409381151701d5:
>
>   Merge remote-tracking branch 'remotes/dgilbert/tags/pull-hmp-20171030' into staging (2017-10-31 11:18:00 +0000)
>
> are available in the git repository at:
>
>   https://github.com/stsquad/qemu.git tags/pull-ci-updates-for-softfreeze-021117-2
>
> for you to fetch changes up to e58c1f9b35e81dec90c3d483b57351256cecfc41:
>
>   docker: add python stdlib dependency (required by keycodemapdb) (2017-11-02 11:46:41 +0000)
>
> ----------------------------------------------------------------
> One fix for win32/64 cross compiles.
>
> ----------------------------------------------------------------
> Philippe Mathieu-Daudé (1):
>       docker: add python stdlib dependency (required by keycodemapdb)
>
>  tests/docker/dockerfiles/debian8-mxe.docker | 1 +
>  1 file changed, 1 insertion(+)

Applied, thanks.

-- PMM

From: Philippe Mathieu-Daudé <f4bug@amsat.org>

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>

diff --git a/tests/docker/dockerfiles/debian8-mxe.docker b/tests/docker/dockerfiles/debian8-mxe.docker
index 7bf1b59e54..9b8e577b03 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/ 
-- 
2.14.2