aboutsummaryrefslogtreecommitdiff
path: root/trusty-i386-tcwg-base
diff options
context:
space:
mode:
authorChristophe Lyon <christophe.lyon@linaro.org>2017-03-27 13:25:05 +0000
committerFathi Boudra <fathi.boudra@linaro.org>2017-04-11 11:57:28 +0000
commit6cc5233a0df42601c29f579096719f4355d0dd9b (patch)
tree1f06ecc297bf3f5384a7e1ba8ee966b8a692ba38 /trusty-i386-tcwg-base
parentccf0784bfcff79d63513785f9dd7152995a8d10f (diff)
{trusty,xenial}-{amd64,i386}-tcwg-base: build QEMU 2.8.0 from sources
add the necessary dependencies: libglib2.0-dev and pkg-config. build/install qemu-2.8.0 (armeb) under /usr/local. We want to upgrade the version we use in our validations, and installing it in the Docker image seems to be a convenient way. Change-Id: Ie5885fe8b91bef2c02a9d1d5da49d5a92c555730
Diffstat (limited to 'trusty-i386-tcwg-base')
-rw-r--r--trusty-i386-tcwg-base/Dockerfile11
1 files changed, 11 insertions, 0 deletions
diff --git a/trusty-i386-tcwg-base/Dockerfile b/trusty-i386-tcwg-base/Dockerfile
index 2880aecc..b2b2077f 100644
--- a/trusty-i386-tcwg-base/Dockerfile
+++ b/trusty-i386-tcwg-base/Dockerfile
@@ -39,6 +39,7 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \
gdbserver \
git \
libexpat1-dev \
+ libglib2.0-dev \
liblzma-dev \
libncurses5-dev \
libpython2.7-dev \
@@ -55,6 +56,7 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \
ninja-build \
openjdk-7-jdk \
openssh-server \
+ pkg-config \
python-dev \
pxz \
qemu-user \
@@ -86,6 +88,15 @@ RUN install -D -p -m0755 /usr/share/doc/git/contrib/workdir/git-new-workdir /usr
&& echo "MaxStartups 256" >> /etc/ssh/sshd_config \
&& echo "MaxSessions 256" >> /etc/ssh/sshd_config
+RUN mkdir /tmp/docker-install-qemu.$$ \
+ && cd /tmp/docker-install-qemu.$$ \
+ && qemu_ver=2.8.0 && wget --progress=dot:giga http://download.qemu-project.org/qemu-${qemu_ver}.tar.xz \
+ && tar xf qemu-${qemu_ver}.tar.xz \
+ && mkdir build && cd build \
+ && ../qemu-${qemu_ver}/configure --prefix=/usr/local --target-list=armeb-linux-user \
+ && make all install -j $(nproc --all) \
+ && cd && rm -rf /tmp/docker-install-qemu.$$
+
# We use ssh multiplexing, which creates sockets in /tmp. Overlayfs,
# which docker is using, can't host sockets, so we use a scratch mount
# for /tmp. This requires that we add --rm option to "docker run"