aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOmair Javaid <omair.javaid@linaro.org>2019-01-28 08:06:40 +0500
committerOmair Javaid <omair.javaid@linaro.org>2019-01-28 17:03:03 +0500
commit3f6a0d50f3256c562f543f5aeff4c9092189946a (patch)
treeefe92236605a54cb31e451dca922ce17feef02a3
parent0b2df6f4c11741391522013d8b8674eec215e9c9 (diff)
Update QEMU version in dockerfiles
This patch updates QEMU version in master branch. I have tested building all affected variants locally by running respective ./build.sh. We intend on updating the version for master branch and then using this with buildfarm-cmp job to compare against tcwd-tested branch. Change-Id: I538dc01f8f4b931e018af1ec987059b8465b6dba
Diffstat
-rw-r--r--bionic-amd64-tcwg-base/Dockerfile13
-rw-r--r--bionic-arm64-tcwg-base/Dockerfile3
-rw-r--r--tcwg-base/Dockerfile.in9
-rw-r--r--trusty-amd64-tcwg-base/Dockerfile6
-rw-r--r--trusty-arm64-tcwg-base/Dockerfile3
-rw-r--r--trusty-armhf-tcwg-base/Dockerfile3
-rw-r--r--trusty-i386-tcwg-base/Dockerfile6
-rw-r--r--xenial-amd64-tcwg-base/Dockerfile6
-rw-r--r--xenial-arm64-tcwg-base/Dockerfile3
-rw-r--r--xenial-armhf-tcwg-base/Dockerfile3
-rw-r--r--xenial-i386-tcwg-base/Dockerfile6
11 files changed, 40 insertions, 21 deletions
diff --git a/bionic-amd64-tcwg-base/Dockerfile b/bionic-amd64-tcwg-base/Dockerfile
index da74cf99..1e639a57 100644
--- a/bionic-amd64-tcwg-base/Dockerfile
+++ b/bionic-amd64-tcwg-base/Dockerfile
@@ -48,6 +48,7 @@ RUN true \
libmpc-dev \
libmpfr-dev \
libncurses5-dev \
+ libpixman-1-dev \
libpython2.7-dev \
libreadline-dev \
libssl-dev \
@@ -118,7 +119,15 @@ RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \
&& cd .. \
&& rm -rf ninja
-# QEMU 2.8 doesn't build cleanly with Ubuntu Bionic's gcc.
+RUN mkdir /tmp/docker-install-qemu.$$ \
+ && cd /tmp/docker-install-qemu.$$ \
+ && qemu_ver=3.1.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.$$
+
COPY home-data/ /home-data/
COPY new-user.sh /usr/local/bin/
@@ -137,4 +146,4 @@ VOLUME /tmp
EXPOSE 22
CMD ["/usr/sbin/sshd", "-D"]
-# checksum: 0194b0d4caf4b187b4db2feced288faa
+# checksum: af1326e7c8496d13d3b9983562697055
diff --git a/bionic-arm64-tcwg-base/Dockerfile b/bionic-arm64-tcwg-base/Dockerfile
index 77baedac..3c995343 100644
--- a/bionic-arm64-tcwg-base/Dockerfile
+++ b/bionic-arm64-tcwg-base/Dockerfile
@@ -113,7 +113,6 @@ RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \
&& cd .. \
&& rm -rf ninja
-# QEMU 2.8 doesn't build cleanly with Ubuntu Bionic's gcc.
COPY home-data/ /home-data/
COPY new-user.sh /usr/local/bin/
@@ -132,4 +131,4 @@ VOLUME /tmp
EXPOSE 22
CMD ["/usr/sbin/sshd", "-D"]
-# checksum: f06707867303dcd39a170f5fd441c5e6
+# checksum: 50a99c601dd50c455613a9aa28c5c136
diff --git a/tcwg-base/Dockerfile.in b/tcwg-base/Dockerfile.in
index 5b6de982..16cedea6 100644
--- a/tcwg-base/Dockerfile.in
+++ b/tcwg-base/Dockerfile.in
@@ -78,6 +78,9 @@ RUN true \
libmpc-dev \
libmpfr-dev \
libncurses5-dev \
+#if ARCH_amd64 || ARCH_i386
+ libpixman-1-dev \
+#endif
libpython2.7-dev \
libreadline-dev \
libssl-dev \
@@ -167,11 +170,10 @@ RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \
&& cd .. \
&& rm -rf ninja
-#if !DISTRO_bionic
#if ARCH_amd64 || ARCH_i386
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 \
+ && qemu_ver=3.1.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 \
@@ -179,10 +181,7 @@ RUN mkdir /tmp/docker-install-qemu.$$ \
&& cd && rm -rf /tmp/docker-install-qemu.$$
#endif
-#else
-# QEMU 2.8 doesn't build cleanly with Ubuntu Bionic's gcc.
-#endif
COPY home-data/ /home-data/
COPY new-user.sh /usr/local/bin/
diff --git a/trusty-amd64-tcwg-base/Dockerfile b/trusty-amd64-tcwg-base/Dockerfile
index d4196de0..e31b6105 100644
--- a/trusty-amd64-tcwg-base/Dockerfile
+++ b/trusty-amd64-tcwg-base/Dockerfile
@@ -52,6 +52,7 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \
libmpc-dev \
libmpfr-dev \
libncurses5-dev \
+ libpixman-1-dev \
libpython2.7-dev \
libreadline-dev \
libssl-dev \
@@ -124,13 +125,14 @@ RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \
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 \
+ && qemu_ver=3.1.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.$$
+
COPY home-data/ /home-data/
COPY new-user.sh /usr/local/bin/
@@ -148,4 +150,4 @@ VOLUME /tmp
EXPOSE 22
CMD ["/usr/sbin/sshd", "-D"]
-# checksum: 2661c449ac5d56e53d78ae12e847a7c2
+# checksum: af4fa2fbc82a8ade63491e2a489bb96b
diff --git a/trusty-arm64-tcwg-base/Dockerfile b/trusty-arm64-tcwg-base/Dockerfile
index 600f86d7..2d20e996 100644
--- a/trusty-arm64-tcwg-base/Dockerfile
+++ b/trusty-arm64-tcwg-base/Dockerfile
@@ -115,6 +115,7 @@ RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \
&& cd .. \
&& rm -rf ninja
+
COPY home-data/ /home-data/
COPY new-user.sh /usr/local/bin/
@@ -132,4 +133,4 @@ VOLUME /tmp
EXPOSE 22
CMD ["/usr/sbin/sshd", "-D"]
-# checksum: d530d7e3c1238866c3d2612069083c6c
+# checksum: 9a5ebe95dcd5b6352f12f31a90067e8e
diff --git a/trusty-armhf-tcwg-base/Dockerfile b/trusty-armhf-tcwg-base/Dockerfile
index 4e1fe4ee..bb6b66c8 100644
--- a/trusty-armhf-tcwg-base/Dockerfile
+++ b/trusty-armhf-tcwg-base/Dockerfile
@@ -115,6 +115,7 @@ RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \
&& cd .. \
&& rm -rf ninja
+
COPY home-data/ /home-data/
COPY new-user.sh /usr/local/bin/
@@ -132,4 +133,4 @@ VOLUME /tmp
EXPOSE 22
CMD ["linux32", "/usr/sbin/sshd", "-D"]
-# checksum: 336d3336277ceb3f8f46fb62f4292322
+# checksum: 43dd94b79ec30383f8b930e4d0d36681
diff --git a/trusty-i386-tcwg-base/Dockerfile b/trusty-i386-tcwg-base/Dockerfile
index 7b7a0403..c0a61ece 100644
--- a/trusty-i386-tcwg-base/Dockerfile
+++ b/trusty-i386-tcwg-base/Dockerfile
@@ -54,6 +54,7 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \
libmpc-dev \
libmpfr-dev \
libncurses5-dev \
+ libpixman-1-dev \
libpython2.7-dev \
libreadline-dev \
libssl-dev \
@@ -125,13 +126,14 @@ RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \
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 \
+ && qemu_ver=3.1.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.$$
+
COPY home-data/ /home-data/
COPY new-user.sh /usr/local/bin/
@@ -149,4 +151,4 @@ VOLUME /tmp
EXPOSE 22
CMD ["linux32", "/usr/sbin/sshd", "-D"]
-# checksum: 433571b2ae2a35fbafe919e2f07628dc
+# checksum: 28f82b9ce96b1387fbb2f487e16ab011
diff --git a/xenial-amd64-tcwg-base/Dockerfile b/xenial-amd64-tcwg-base/Dockerfile
index f0148d63..4aadf6a4 100644
--- a/xenial-amd64-tcwg-base/Dockerfile
+++ b/xenial-amd64-tcwg-base/Dockerfile
@@ -52,6 +52,7 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \
libmpc-dev \
libmpfr-dev \
libncurses5-dev \
+ libpixman-1-dev \
libpython2.7-dev \
libreadline-dev \
libssl-dev \
@@ -123,13 +124,14 @@ RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \
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 \
+ && qemu_ver=3.1.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.$$
+
COPY home-data/ /home-data/
COPY new-user.sh /usr/local/bin/
@@ -147,4 +149,4 @@ VOLUME /tmp
EXPOSE 22
CMD ["/usr/sbin/sshd", "-D"]
-# checksum: 2b7bea08d9d2e3d95fabdf65213b0c55
+# checksum: 45c951efede684cca687084277d49621
diff --git a/xenial-arm64-tcwg-base/Dockerfile b/xenial-arm64-tcwg-base/Dockerfile
index 7c9281fd..2ba6c04f 100644
--- a/xenial-arm64-tcwg-base/Dockerfile
+++ b/xenial-arm64-tcwg-base/Dockerfile
@@ -116,6 +116,7 @@ RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \
&& cd .. \
&& rm -rf ninja
+
COPY home-data/ /home-data/
COPY new-user.sh /usr/local/bin/
@@ -133,4 +134,4 @@ VOLUME /tmp
EXPOSE 22
CMD ["/usr/sbin/sshd", "-D"]
-# checksum: ae059918f8f11a099877093283a6acad
+# checksum: 5d69a0e67de38ed9fb2fd87244c1b6ce
diff --git a/xenial-armhf-tcwg-base/Dockerfile b/xenial-armhf-tcwg-base/Dockerfile
index 0b53fb88..9964f843 100644
--- a/xenial-armhf-tcwg-base/Dockerfile
+++ b/xenial-armhf-tcwg-base/Dockerfile
@@ -116,6 +116,7 @@ RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \
&& cd .. \
&& rm -rf ninja
+
COPY home-data/ /home-data/
COPY new-user.sh /usr/local/bin/
@@ -133,4 +134,4 @@ VOLUME /tmp
EXPOSE 22
CMD ["linux32", "/usr/sbin/sshd", "-D"]
-# checksum: cb84052322f12cc9ebfc7de5a7433c30
+# checksum: 85986dd6dd8ddc162d40addb2a4f80b8
diff --git a/xenial-i386-tcwg-base/Dockerfile b/xenial-i386-tcwg-base/Dockerfile
index 1b005710..1023b6ed 100644
--- a/xenial-i386-tcwg-base/Dockerfile
+++ b/xenial-i386-tcwg-base/Dockerfile
@@ -54,6 +54,7 @@ RUN (url="http://archive.ubuntu.com/ubuntu/"; \
libmpc-dev \
libmpfr-dev \
libncurses5-dev \
+ libpixman-1-dev \
libpython2.7-dev \
libreadline-dev \
libssl-dev \
@@ -125,13 +126,14 @@ RUN git clone -b master https://github.com/maxim-kuvyrkov/ninja.git \
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 \
+ && qemu_ver=3.1.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.$$
+
COPY home-data/ /home-data/
COPY new-user.sh /usr/local/bin/
@@ -149,4 +151,4 @@ VOLUME /tmp
EXPOSE 22
CMD ["linux32", "/usr/sbin/sshd", "-D"]
-# checksum: 367dc252da4b990e6b3bfc8e333b1770
+# checksum: 6250ecddc1d62a1bd9c34d0a1af2b5de
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 01:13:37 +0000