diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2016-06-06 16:46:54 +0200 |
|---|---|---|
| committer | Fam Zheng <famz@redhat.com> | 2016-06-08 15:19:30 +0800 |
| commit | 2346b12fc52dd15421bbcc797f307d634ca1636f (patch) | |
| tree | 192911493a24c64a59e09b4de1b5bdfe4175901d /tests/docker | |
| parent | 53735f0b823d655f8e29e43d4ed6080970c87019 (diff) | |
| download | qemu-2346b12fc52dd15421bbcc797f307d634ca1636f.zip qemu-2346b12fc52dd15421bbcc797f307d634ca1636f.tar.gz qemu-2346b12fc52dd15421bbcc797f307d634ca1636f.tar.bz2 | |
tests/docker: fix test-mingw
Add flex and bison for use in test-mingw, because test-mingw
uses the in-tree libdtc.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 1465224417-141321-4-git-send-email-pbonzini@redhat.com
Signed-off-by: Fam Zheng <famz@redhat.com>
Diffstat (limited to 'tests/docker')
| -rw-r--r-- | tests/docker/dockerfiles/fedora.docker | 2 | ||||
| -rw-r--r-- | tests/docker/dockerfiles/ubuntu.docker | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/docker/dockerfiles/fedora.docker b/tests/docker/dockerfiles/fedora.docker index 6251e45..76acff3 100644 --- a/tests/docker/dockerfiles/fedora.docker +++ b/tests/docker/dockerfiles/fedora.docker @@ -1,6 +1,6 @@ FROM fedora:23 RUN dnf install -y \ - ccache git tar \ + ccache git tar flex bison \ glib2-devel pixman-devel zlib-devel SDL-devel libfdt-devel \ gcc gcc-c++ clang make perl which bc findutils \ mingw{32,64}-{pixman,glib2,gmp,SDL,pkg-config,gtk2,gtk3,gnutls,nettle,libtasn1,libjpeg-turbo,libpng,curl,libssh2,bzip2} diff --git a/tests/docker/dockerfiles/ubuntu.docker b/tests/docker/dockerfiles/ubuntu.docker index 725a7ca..44ecc12 100644 --- a/tests/docker/dockerfiles/ubuntu.docker +++ b/tests/docker/dockerfiles/ubuntu.docker @@ -2,7 +2,7 @@ FROM ubuntu:14.04 RUN echo "deb http://archive.ubuntu.com/ubuntu/ trusty universe multiverse" >> \ /etc/apt/sources.list RUN apt-get update -RUN apt-get -y install \ +RUN apt-get -y install flex bison \ libusb-1.0-0-dev libiscsi-dev librados-dev libncurses5-dev \ libseccomp-dev libgnutls-dev libssh2-1-dev libspice-server-dev \ libspice-protocol-dev libnss3-dev libfdt-dev \ |