diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-11-03 10:08:34 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-11-03 10:08:34 +0000 |
| commit | b33afc415622e5eb26e0f14fd27eb86e32a5472e (patch) | |
| tree | 40c762c91f9c13825eb88478b6dd65e6eb507a92 | |
| parent | 9c4da1fa2b667aa50c0db9557fa04593bef54a76 (diff) | |
| parent | e58c1f9b35e81dec90c3d483b57351256cecfc41 (diff) | |
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) <alex.bennee@linaro.org>"
# 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 <peter.maydell@linaro.org>
| -rw-r--r-- | tests/docker/dockerfiles/debian8-mxe.docker | 1 |
1 files changed, 1 insertions, 0 deletions
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/ |