ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

docker: debian/s390x no more in unstable, now available in Stretch 

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2017-07-17 21:31:35 -03:00 committed by Alex Bennée
parent 94afe49eab
commit 7d2bcf2363
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tests/docker/Makefile.include
View File

@ -59,6 +59,7 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker
docker-image-debian-armhf-cross: docker-image-debian9 docker-image-debian-armhf-cross: docker-image-debian9
docker-image-debian-arm64-cross: docker-image-debian9 docker-image-debian-arm64-cross: docker-image-debian9
docker-image-debian-mipsel-cross: docker-image-debian9 docker-image-debian-mipsel-cross: docker-image-debian9
docker-image-debian-s390x-cross: docker-image-debian9
# Expand all the pre-requistes for each docker image and test combination # Expand all the pre-requistes for each docker image and test combination
$(foreach i,$(DOCKER_IMAGES), \ $(foreach i,$(DOCKER_IMAGES), \

20
tests/docker/dockerfiles/debian-s390x-cross.docker
View File

@ -1,27 +1,27 @@
# #
# Docker s390 cross-compiler target # Docker s390 cross-compiler target
# #
# This docker target is based on stretch (testing) as the stable build # This docker target builds on the debian Stretch base image.
# doesn't have the cross compiler available.
# #
FROM debian:testing-slim FROM qemu:debian9
# Duplicate deb line as deb-src
RUN cat /etc/apt/sources.list | sed "s/deb/deb-src/" >> /etc/apt/sources.list
# Add the s390x architecture # Add the s390x architecture
RUN dpkg --add-architecture s390x RUN dpkg --add-architecture s390x
# Grab the updated list of packages # Grab the updated list of packages
RUN apt update && apt dist-upgrade -yy RUN apt update && apt dist-upgrade -yy
RUN apt install -yy build-essential clang RUN DEBIAN_FRONTEND=noninteractive eatmydata \
RUN apt-get build-dep -yy -a s390x qemu || apt-get -f install apt-get install -y --no-install-recommends \
RUN apt install -yy gcc-multilib-s390x-linux-gnu binutils-multiarch gcc-multilib-s390x-linux-gnu
RUN DEBIAN_FRONTEND=noninteractive eatmydata \
apt-get build-dep -yy -a s390x qemu
# Specify the cross prefix for this image (see tests/docker/common.rc) # Specify the cross prefix for this image (see tests/docker/common.rc)
ENV QEMU_CONFIGURE_OPTS --cross-prefix=s390x-linux-gnu- ENV QEMU_CONFIGURE_OPTS --cross-prefix=s390x-linux-gnu-
RUN DEBIAN_FRONTEND=noninteractive \ # Install extra libraries to increase code coverage
RUN DEBIAN_FRONTEND=noninteractive eatmydata \
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
glusterfs-common:s390x \ glusterfs-common:s390x \
libbz2-dev:s390x \ libbz2-dev:s390x \