OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

One fix for win32/64 cross compiles.

Browse Source 
-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQEcBAABAgAGBQJZ+wfCAAoJEPvQ2wlanipEW7QH/2acWM0OysndgO7fJFEoCL6L
 uqC8H52nrBESeqzz9JJHVimv73bl5Uogo9gdvB2aoaVpyq4dTl5LP72WVlvx1YsX
 Nxpagf5ilEzRGbneHQtkItIRDEQzJm/76J8bX5dd2gqz572g8OavOr1Thr7FTw1m
 vun+zY5Heujq81XLLScK2Ig2WbI72Zj4KJ8AdwhtvL8H0GbehULhKFiDNhHd9Z8r
 Hy79V9U4nG0bBFQqqithJn2uqvlNY+2seSZRyJg/+42mX3Irxn3gwLeE5BUGOyPw
 6/XjR6m1aoew5OIUqMXeyPZhH680ZqssuYRS2f5afVeAgCYjWaV+KLmPqDVxvBs=
 =bQLe
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2017-11-03 10:08:34 +00:00
commit b33afc4156
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/docker/dockerfiles/debian8-mxe.docker
View File

@ -13,6 +13,7 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys D43A795B73B16ABE964
RUN apt-get update RUN apt-get update
RUN DEBIAN_FRONTEND=noninteractive eatmydata \ RUN DEBIAN_FRONTEND=noninteractive eatmydata \
apt-get install -y --no-install-recommends \ 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) $(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/ ENV PATH $PATH:/usr/lib/mxe/usr/bin/