[Qemu-commits] [qemu/qemu] e58c1f: docker: add python stdlib dependency (required by ...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: e58c1f9b35e81dec90c3d483b57351256cecfc41
      
https://github.com/qemu/qemu/commit/e58c1f9b35e81dec90c3d483b57351256cecfc41
  Author: Philippe Mathieu-Daudé <address@hidden>
  Date:   2017-11-02 (Thu, 02 Nov 2017)

  Changed paths:
    M tests/docker/dockerfiles/debian8-mxe.docker

  Log Message:
  -----------
  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é <address@hidden>
Signed-off-by: Alex Bennée <address@hidden>


  Commit: b33afc415622e5eb26e0f14fd27eb86e32a5472e
      
https://github.com/qemu/qemu/commit/b33afc415622e5eb26e0f14fd27eb86e32a5472e
  Author: Peter Maydell <address@hidden>
  Date:   2017-11-03 (Fri, 03 Nov 2017)

  Changed paths:
    M tests/docker/dockerfiles/debian8-mxe.docker

  Log Message:
  -----------
  Merge remote-tracking branch 
'remotes/stsquad/tags/pull-ci-updates-for-softfreeze-021117-2' into staging

One fix for win32/64 cross compiles.

# gpg: Signature made Thu 02 Nov 2017 11:55:46 GMT
# gpg:                using RSA key 0xFBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <address@hidden>"
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8  DF35 FBD0 DB09 5A9E 2A44

* remotes/stsquad/tags/pull-ci-updates-for-softfreeze-021117-2:
  docker: add python stdlib dependency (required by keycodemapdb)

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/9c4da1fa2b66...b33afc415622