[PULL,14/20] docker: Clean the MXE base image

Message ID	20180703101444.23778-15-alex.bennee@linaro.org
State	Superseded
Headers	show Delivered-To: patch@linaro.org Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org> To: peter.maydell@linaro.org Date: Tue, 3 Jul 2018 11:14:38 +0100 Message-Id: <20180703101444.23778-15-alex.bennee@linaro.org> In-Reply-To: <20180703101444.23778-1-alex.bennee@linaro.org> References: <20180703101444.23778-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PULL 14/20] docker: Clean the MXE base image Precedence: list Cc: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>, richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>
Series	Travis, Code Coverage and Cross Build updates \| expand [PULL,00/20] Travis, Code Coverage and Cross Build updates [PULL,01/20] travis: do not waste time cloning unused submodules [PULL,02/20] travis: test out-of-tree builds [PULL,03/20] build-system: remove per-test GCOV reporting [PULL,04/20] .gitignore: add .gcov files [PULL,05/20] docker: add gcovr to travis image [PULL,06/20] travis: add gcovr summary for GCOV build [PULL,07/20] build-system: add clean-coverage target [PULL,08/20] build-system: add coverage-report target [PULL,09/20] linux-user: introduce preexit_cleanup [PULL,10/20] linux-user: add gcov support to preexit_cleanup [PULL,11/20] docker: filter out linux-user builds for mingw [PULL,12/20] docker: ubuntu: Update the package list before installing new ones [PULL,13/20] docker: ubuntu: Use SDL2 [PULL,14/20] docker: Clean the MXE base image [PULL,15/20] docker: Do not run tests in 'intermediate' images [PULL,16/20] docker: drop QEMU build-dep from bootstrap [PULL,17/20] docker: debian-bootstrap.pre allow customising of variant/url [PULL,18/20] docker: add special handling for FROM:debian-%-user targets [PULL,19/20] docker: add special rule for deboostrapped images [PULL,20/20] docker: add linux-user powered cross builder for QEMU

Message ID

20180703101444.23778-15-alex.bennee@linaro.org

State

Superseded

Headers

Received-SPF: pass (google.com: domain of
	qemu-devel-bounces+patch=linaro.org@nongnu.org designates
	2001:4830:134:3::11 as permitted sender)
	client-ip=2001:4830:134:3::11; 
From: =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>
To: peter.maydell@linaro.org
Date: Tue,  3 Jul 2018 11:14:38 +0100
Message-Id: <20180703101444.23778-15-alex.bennee@linaro.org>
In-Reply-To: <20180703101444.23778-1-alex.bennee@linaro.org>
References: <20180703101444.23778-1-alex.bennee@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [Qemu-devel] [PULL 14/20] docker: Clean the MXE base image
Precedence: list
Cc: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>,
	richard.henderson@linaro.org, qemu-devel@nongnu.org, 
	f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net
Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>

Series

Travis, Code Coverage and Cross Build updates | expand

Commit Message

Alex Bennée July 3, 2018, 10:14 a.m. UTC

From: Philippe Mathieu-Daudé <f4bug@amsat.org>


Using the duplicated same package is confusing.

Reported-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>


-- 
2.17.1

diff --git a/tests/docker/dockerfiles/debian8-mxe.docker b/tests/docker/dockerfiles/debian8-mxe.docker
index 9b8e577b03..2df4cc8c5c 100644
--- a/tests/docker/dockerfiles/debian8-mxe.docker
+++ b/tests/docker/dockerfiles/debian8-mxe.docker
@@ -14,6 +14,6 @@  RUN apt-get update
 RUN DEBIAN_FRONTEND=noninteractive eatmydata \
     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 | egrep "^Inst mxe-x86-64-unknown-" | cut -d\  -f2)
 
 ENV PATH $PATH:/usr/lib/mxe/usr/bin/

[PULL,14/20] docker: Clean the MXE base image

Commit Message

Patch