| Message ID | 20180517174718.10107-45-alex.bennee@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | fix building of tests/tcg | expand |
On 05/17/2018 02:47 PM, Alex Bennée wrote: > As before, using Debian SID compilers. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > tests/docker/Makefile.include | 1 + > tests/docker/dockerfiles/debian-mips64-cross.docker | 12 ++++++++++++ > tests/tcg/mips/Makefile.include | 3 +++ > 3 files changed, 16 insertions(+) > create mode 100644 tests/docker/dockerfiles/debian-mips64-cross.docker > > diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include > index 62d1f4dec0..f58afb8c5d 100644 > --- a/tests/docker/Makefile.include > +++ b/tests/docker/Makefile.include > @@ -67,6 +67,7 @@ docker-image-debian-hppa-cross: docker-image-debian-sid > docker-image-debian-m68k-cross: docker-image-debian-sid > docker-image-debian-sh4-cross: docker-image-debian-sid > docker-image-debian-sparc64-cross: docker-image-debian-sid > +docker-image-debian-mips64-cross: docker-image-debian-sid > docker-image-travis: NOUSER=1 > > # Expand all the pre-requistes for each docker image and test combination > diff --git a/tests/docker/dockerfiles/debian-mips64-cross.docker b/tests/docker/dockerfiles/debian-mips64-cross.docker > new file mode 100644 > index 0000000000..ed1ce0e919 > --- /dev/null > +++ b/tests/docker/dockerfiles/debian-mips64-cross.docker > @@ -0,0 +1,12 @@ > +# > +# Docker cross-compiler target > +# > +# This docker target builds on the debian sid base image which > +# contains cross compilers for Debian "ports" targets. > +# > +FROM qemu:debian-sid > + > +RUN DEBIAN_FRONTEND=noninteractive eatmydata \ > + apt-get install -y --no-install-recommends \ > + gcc-mips64-linux-gnuabi64 \ > + libc6-dev-mips64-cross > diff --git a/tests/tcg/mips/Makefile.include b/tests/tcg/mips/Makefile.include > index a9beceb623..4a14fc078d 100644 > --- a/tests/tcg/mips/Makefile.include > +++ b/tests/tcg/mips/Makefile.include > @@ -8,6 +8,9 @@ > ifeq ($(TARGET_NAME),mips64el) > DOCKER_IMAGE=debian-mips64el-cross > DOCKER_CROSS_COMPILER=mips64el-linux-gnuabi64-gcc > +else ifeq ($(TARGET_NAME),mips64) > +DOCKER_IMAGE=debian-mips64-cross > +DOCKER_CROSS_COMPILER=mips64-linux-gnuabi64-gcc > else ifeq ($(TARGET_NAME),mipsel) > DOCKER_IMAGE=debian-mipsel-cross > DOCKER_CROSS_COMPILER=mipsel-linux-gnu-gcc > Using a snapshot: -- >8 -- diff --git a/tests/docker/dockerfiles/debian-sid.docker b/tests/docker/dockerfiles/debian-sid.docker -# Duplicate deb line as deb-src -RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list +# random 'working' snapshot +RUN echo "deb http://snapshot.debian.org/archive/debian/20180512T101008Z/ sid main" > /etc/apt/sources.list && \ + echo "deb-src http://snapshot.debian.org/archive/debian/20180512T101008Z/ sid main" >> /etc/apt/sources.list -- Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 62d1f4dec0..f58afb8c5d 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -67,6 +67,7 @@ docker-image-debian-hppa-cross: docker-image-debian-sid docker-image-debian-m68k-cross: docker-image-debian-sid docker-image-debian-sh4-cross: docker-image-debian-sid docker-image-debian-sparc64-cross: docker-image-debian-sid +docker-image-debian-mips64-cross: docker-image-debian-sid docker-image-travis: NOUSER=1 # Expand all the pre-requistes for each docker image and test combination diff --git a/tests/docker/dockerfiles/debian-mips64-cross.docker b/tests/docker/dockerfiles/debian-mips64-cross.docker new file mode 100644 index 0000000000..ed1ce0e919 --- /dev/null +++ b/tests/docker/dockerfiles/debian-mips64-cross.docker @@ -0,0 +1,12 @@ +# +# Docker cross-compiler target +# +# This docker target builds on the debian sid base image which +# contains cross compilers for Debian "ports" targets. +# +FROM qemu:debian-sid + +RUN DEBIAN_FRONTEND=noninteractive eatmydata \ + apt-get install -y --no-install-recommends \ + gcc-mips64-linux-gnuabi64 \ + libc6-dev-mips64-cross diff --git a/tests/tcg/mips/Makefile.include b/tests/tcg/mips/Makefile.include index a9beceb623..4a14fc078d 100644 --- a/tests/tcg/mips/Makefile.include +++ b/tests/tcg/mips/Makefile.include @@ -8,6 +8,9 @@ ifeq ($(TARGET_NAME),mips64el) DOCKER_IMAGE=debian-mips64el-cross DOCKER_CROSS_COMPILER=mips64el-linux-gnuabi64-gcc +else ifeq ($(TARGET_NAME),mips64) +DOCKER_IMAGE=debian-mips64-cross +DOCKER_CROSS_COMPILER=mips64-linux-gnuabi64-gcc else ifeq ($(TARGET_NAME),mipsel) DOCKER_IMAGE=debian-mipsel-cross DOCKER_CROSS_COMPILER=mipsel-linux-gnu-gcc
As before, using Debian SID compilers. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> --- tests/docker/Makefile.include | 1 + tests/docker/dockerfiles/debian-mips64-cross.docker | 12 ++++++++++++ tests/tcg/mips/Makefile.include | 3 +++ 3 files changed, 16 insertions(+) create mode 100644 tests/docker/dockerfiles/debian-mips64-cross.docker -- 2.17.0