| Message ID | 20190904203013.9028-20-alex.bennee@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | current testing/next queue (podman, docker, ci) | expand |
On 9/4/19 10:29 PM, Alex Bennée wrote: > Now Buster is released we can stop relying on the movable feast that > is Sid for our cross-compiler for building tests. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > tests/docker/Makefile.include | 2 +- > tests/docker/dockerfiles/debian-riscv64-cross.docker | 5 ++--- > 2 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include > index 896c1c5a601..93190b1e2a2 100644 > --- a/tests/docker/Makefile.include > +++ b/tests/docker/Makefile.include > @@ -104,10 +104,10 @@ docker-image-debian-hppa-cross: docker-image-debian10 > docker-image-debian-m68k-cross: docker-image-debian10 > docker-image-debian-mips64-cross: docker-image-debian10 > docker-image-debian-powerpc-cross: docker-image-debian10 > +docker-image-debian-riscv64-cross: docker-image-debian10 > docker-image-debian-sh4-cross: docker-image-debian10 > docker-image-debian-sparc64-cross: docker-image-debian10 > > -docker-image-debian-riscv64-cross: docker-image-debian-sid > docker-image-debian-ppc64-cross: docker-image-debian-sid > docker-image-travis: NOUSER=1 > > diff --git a/tests/docker/dockerfiles/debian-riscv64-cross.docker b/tests/docker/dockerfiles/debian-riscv64-cross.docker > index 221697f9d11..5e2d6ddb600 100644 > --- a/tests/docker/dockerfiles/debian-riscv64-cross.docker > +++ b/tests/docker/dockerfiles/debian-riscv64-cross.docker > @@ -1,10 +1,9 @@ > # > # Docker cross-compiler target > # > -# This docker target builds on the debian sid base image which > -# contains cross compilers for Debian "ports" targets. > +# This docker target builds on the debian Buster base image. > # > -FROM qemu:debian-sid > +FROM qemu:debian10 > > RUN apt update && \ > DEBIAN_FRONTEND=noninteractive eatmydata \ >
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 896c1c5a601..93190b1e2a2 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -104,10 +104,10 @@ docker-image-debian-hppa-cross: docker-image-debian10 docker-image-debian-m68k-cross: docker-image-debian10 docker-image-debian-mips64-cross: docker-image-debian10 docker-image-debian-powerpc-cross: docker-image-debian10 +docker-image-debian-riscv64-cross: docker-image-debian10 docker-image-debian-sh4-cross: docker-image-debian10 docker-image-debian-sparc64-cross: docker-image-debian10 -docker-image-debian-riscv64-cross: docker-image-debian-sid docker-image-debian-ppc64-cross: docker-image-debian-sid docker-image-travis: NOUSER=1 diff --git a/tests/docker/dockerfiles/debian-riscv64-cross.docker b/tests/docker/dockerfiles/debian-riscv64-cross.docker index 221697f9d11..5e2d6ddb600 100644 --- a/tests/docker/dockerfiles/debian-riscv64-cross.docker +++ b/tests/docker/dockerfiles/debian-riscv64-cross.docker @@ -1,10 +1,9 @@ # # Docker cross-compiler target # -# This docker target builds on the debian sid base image which -# contains cross compilers for Debian "ports" targets. +# This docker target builds on the debian Buster base image. # -FROM qemu:debian-sid +FROM qemu:debian10 RUN apt update && \ DEBIAN_FRONTEND=noninteractive eatmydata \
Now Buster is released we can stop relying on the movable feast that is Sid for our cross-compiler for building tests. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> --- tests/docker/Makefile.include | 2 +- tests/docker/dockerfiles/debian-riscv64-cross.docker | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) -- 2.20.1