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

docker: rename debian stable -> 9 (Stretch) 

We'll also want to support some older Debian combinations for
architectures that didn't make the Debian 9 cut.

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
[AJB: extend commit msg]
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2017-07-17 21:31:33 -03:00 committed by Alex Bennée
parent ed7023b05b
commit 24044d4825
5 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/docker/Makefile.include
View File

@ -56,9 +56,9 @@ docker-image-%: $(DOCKER_FILES_DIR)/%.docker
"BUILD","$*")
# Enforce dependancies for composite images
docker-image-debian-armhf-cross: docker-image-debian
docker-image-debian-arm64-cross: docker-image-debian
docker-image-debian-mipsel-cross: docker-image-debian
docker-image-debian-armhf-cross: docker-image-debian9
docker-image-debian-arm64-cross: docker-image-debian9
docker-image-debian-mipsel-cross: docker-image-debian9
# Expand all the pre-requistes for each docker image and test combination
$(foreach i,$(DOCKER_IMAGES), \

4
tests/docker/dockerfiles/debian-arm64-cross.docker
View File

@ -1,9 +1,9 @@
#
# Docker arm64 cross-compiler target
#
# This docker target builds on the base debian image.
# This docker target builds on the debian Stretch base image.
#
FROM qemu:debian
FROM qemu:debian9
# Add the foreign architecture we want and install dependencies
RUN dpkg --add-architecture arm64

4
tests/docker/dockerfiles/debian-armhf-cross.docker
View File

@ -1,9 +1,9 @@
#
# Docker armhf cross-compiler target
#
# This docker target builds on the base debian image.
# This docker target builds on the debian Stretch base image.
#
FROM qemu:debian
FROM qemu:debian9
# Add the foreign architecture we want and install dependencies
RUN dpkg --add-architecture armhf

4
tests/docker/dockerfiles/debian-mipsel-cross.docker
View File

@ -1,9 +1,9 @@
#
# Docker mipsel cross-compiler target
#
# This docker target builds on the base debian image.
# This docker target builds on the debian Stretch base image.
#
FROM qemu:debian
FROM qemu:debian9
MAINTAINER Philippe Mathieu-Daudé <f4bug@amsat.org>
# Add the foreign architecture we want and install dependencies

13
tests/docker/dockerfiles/debian.docker → tests/docker/dockerfiles/debian9.docker
View File

@ -1,13 +1,13 @@
#
# Docker multiarch cross-compiler target
#
# This docker target is builds on Debian and Emdebian's cross compiler targets
# to build distro with a selection of cross compilers for building test binaries.
# This docker target is builds on Debian cross compiler targets to build distro
# with a selection of cross compilers for building test binaries.
#
# On its own you can't build much but the docker-foo-cross targets
# build on top of the base debian image.
#
FROM debian:stable-slim
FROM debian:stretch-slim
# Duplicate deb line as deb-src
RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list
@ -17,4 +17,9 @@ RUN apt update
RUN DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata
RUN DEBIAN_FRONTEND=noninteractive eatmydata \
apt install -y --no-install-recommends \
ca-certificates build-essential clang git bison flex
bison \
build-essential \
ca-certificates \
clang \
flex \
git