[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 3/6] tests/docker: fix test-mingw
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PULL 3/6] tests/docker: fix test-mingw |
Date: |
Wed, 8 Jun 2016 15:22:22 +0800 |
From: Paolo Bonzini <address@hidden>
Add flex and bison for use in test-mingw, because test-mingw
uses the in-tree libdtc.
Signed-off-by: Paolo Bonzini <address@hidden>
Message-id: address@hidden
Signed-off-by: Fam Zheng <address@hidden>
---
tests/docker/dockerfiles/fedora.docker | 2 +-
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 \
--
2.8.3
- [Qemu-devel] [PULL 0/6] docker queue, Fam Zheng, 2016/06/08
- [Qemu-devel] [PULL 3/6] tests/docker: fix test-mingw,
Fam Zheng <=
- [Qemu-devel] [PULL 4/6] tests/docker: remove unused feature "ccache", Fam Zheng, 2016/06/08
- [Qemu-devel] [PULL 2/6] tests/docker: make test-full build all targets, not none, Fam Zheng, 2016/06/08
- [Qemu-devel] [PULL 1/6] tests/docker: fix make-archive-maybe, Fam Zheng, 2016/06/08
- [Qemu-devel] [PULL 5/6] tests/docker: support travis test with fedora image, Fam Zheng, 2016/06/08
- [Qemu-devel] [PULL 6/6] tests/docker: build all targets in test-clang, Fam Zheng, 2016/06/08
- Re: [Qemu-devel] [PULL 0/6] docker queue, Peter Maydell, 2016/06/08