[PULL,22/32] docker: add debian/powerpc based on Jessie

Message ID	20170718104513.23947-23-alex.bennee@linaro.org
State	Accepted
Commit	16dcece4d5792bf51caa9a455b985e1ae6dd736f
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: Date: Tue, 18 Jul 2017 11:45:03 +0100 Message-Id: <20170718104513.23947-23-alex.bennee@linaro.org> In-Reply-To: <20170718104513.23947-1-alex.bennee@linaro.org> References: <20170718104513.23947-1-alex.bennee@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [Qemu-devel] [PULL 22/32] docker: add debian/powerpc based on Jessie Precedence: list Cc: Fam Zheng <famz@redhat.com>, =?utf-8?q?Alex_Benn=C3=A9e?= <alex.bennee@linaro.org>, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <f4bug@amsat.org>, "open list:-----------------..." <qemu-devel@nongnu.org> Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>
Series	[PULL,01/32] docker: allow customizing Travis global_env variables \| expand [PULL,01/32] docker: allow customizing Travis global_env variables [PULL,02/32] travis: move make -j flag out of script [PULL,03/32] docker: include python-yaml in travis.docker [PULL,04/32] docker: add debug tools to travis.docker [PULL,05/32] docker: rename debian stable -> 9 (Stretch) [PULL,06/32] docker: add common packages to debian base [PULL,07/32] docker: debian/s390x no more in unstable, now available in Stretch [PULL,08/32] docker: remove packages now dependent of qemu in Stretch [PULL,09/32] docker: optimize debian9 base image [PULL,10/32] docker: add debian/armel based on Stretch [PULL,11/32] docker: add debian/ppc64el based on Stretch [PULL,12/32] docker: add debian/amd64 based on Stretch [PULL,13/32] docker: enable virgl to extend code coverage on amd64 [PULL,14/32] docker: enable netmap to extend code coverage on amd64 [PULL,15/32] docker: enable gcrypt to extend code coverage on amd64 [PULL,16/32] docker: enable nettle to extend code coverage on arm64 [PULL,17/32] shippable: add armel targets [PULL,18/32] shippable: add ppc64el targets [PULL,19/32] shippable: add x86_64 targets [PULL,20/32] docker: add qemu:debian-jessie based on outdated jessie release [PULL,21/32] docker: add 'apt-fake' script which generate fake debian packages [PULL,22/32] docker: add debian/powerpc based on Jessie [PULL,23/32] shippable: add powerpc target [PULL,24/32] docker: add debian/mips[eb] images [PULL,25/32] shippable: use debian/mips[eb] targets [PULL,26/32] docker: add debian/mips64el image [PULL,27/32] shippable: add mips64el targets [PULL,28/32] docker: add MXE (M cross environment) base image for MinGW-w64 [PULL,29/32] shippable: add win32/64 targets [PULL,30/32] docker: add debian Ports base image [PULL,31/32] docker: warn users to use newer debian8/debian9 base image [PULL,32/32] docker: install clang since Shippable setup_ve() verify it is available

Message ID

20170718104513.23947-23-alex.bennee@linaro.org

State

Accepted

Commit

16dcece4d5792bf51caa9a455b985e1ae6dd736f

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: 
Date: Tue, 18 Jul 2017 11:45:03 +0100
Message-Id: <20170718104513.23947-23-alex.bennee@linaro.org>
In-Reply-To: <20170718104513.23947-1-alex.bennee@linaro.org>
References: <20170718104513.23947-1-alex.bennee@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Subject: [Qemu-devel] [PULL 22/32] docker: add debian/powerpc based on Jessie
Precedence: list
Cc: Fam Zheng <famz@redhat.com>, =?utf-8?q?Alex_Benn=C3=A9e?=
	<alex.bennee@linaro.org>, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?=
	<f4bug@amsat.org>, "open list:-----------------..."
	<qemu-devel@nongnu.org>
Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org
Sender: "Qemu-devel" <qemu-devel-bounces+patch=linaro.org@nongnu.org>

Series

[PULL,01/32] docker: allow customizing Travis global_env variables | expand

Commit Message

Alex Bennée July 18, 2017, 10:45 a.m. UTC

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

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

[AJB: split from merged patch]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>


-- 
2.13.0

diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index b5eec5dc68..202efe9ee6 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -55,12 +55,15 @@  docker-image-%: $(DOCKER_FILES_DIR)/%.docker
 		$(if $(EXECUTABLE),--include-executable=$(EXECUTABLE)),\
 		"BUILD","$*")
 
+docker-image-debian-powerpc-cross: EXTRA_FILES:=tests/docker/dockerfiles/debian-apt-fake.sh
+
 # Enforce dependancies for composite images
 docker-image-debian-amd64: docker-image-debian9
 docker-image-debian-armel-cross: docker-image-debian9
 docker-image-debian-armhf-cross: docker-image-debian9
 docker-image-debian-arm64-cross: docker-image-debian9
 docker-image-debian-mipsel-cross: docker-image-debian9
+docker-image-debian-powerpc-cross: docker-image-debian8
 docker-image-debian-ppc64el-cross: docker-image-debian9
 docker-image-debian-s390x-cross: docker-image-debian9
 
diff --git a/tests/docker/dockerfiles/debian-powerpc-cross.docker b/tests/docker/dockerfiles/debian-powerpc-cross.docker
new file mode 100644
index 0000000000..a5dd46b4ac
--- /dev/null
+++ b/tests/docker/dockerfiles/debian-powerpc-cross.docker
@@ -0,0 +1,40 @@ 
+#
+# Docker powerpc cross-compiler target
+#
+# This docker target builds on the debian Jessie base image.
+#
+FROM qemu:debian8
+MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
+
+# Add the foreign architecture we want and install dependencies
+RUN dpkg --add-architecture powerpc
+RUN apt-get update
+RUN DEBIAN_FRONTEND=noninteractive eatmydata \
+    apt-get install -y --no-install-recommends \
+        crossbuild-essential-powerpc
+
+# <kludge> to fix "following packages have unmet dependencies" ...
+ADD debian-apt-fake.sh /usr/local/bin/apt-fake
+RUN apt-get install -y --no-install-recommends \
+        equivs \
+        pkg-config
+RUN apt-fake install \
+        pkg-config:powerpc=0.28-1.1-fake && \
+    ln -s pkg-config /usr/bin/powerpc-linux-gnu-pkg-config
+ENV PKG_CONFIG_PATH /usr/lib/powerpc-linux-gnu/pkgconfig
+# </kludge>
+
+# Specify the cross prefix for this image (see tests/docker/common.rc)
+ENV QEMU_CONFIGURE_OPTS --cross-prefix=powerpc-linux-gnu-
+
+RUN DEBIAN_FRONTEND=noninteractive eatmydata \
+    apt-get build-dep -yy -a powerpc qemu
+RUN DEBIAN_FRONTEND=noninteractive \
+    apt-get install -y --no-install-recommends \
+        glusterfs-common:powerpc \
+        libbz2-dev:powerpc \
+        liblzo2-dev:powerpc \
+        libncursesw5-dev:powerpc \
+        libnfs-dev:powerpc \
+        librdmacm-dev:powerpc \
+        libsnappy-dev:powerpc

[PULL,22/32] docker: add debian/powerpc based on Jessie

Commit Message

Patch