On 9/4/19 10:29 PM, Alex Bennée wrote:
> This should have been marked when the docker recipe was added to
Oops
... was added (in c72d9df1818) to ...?
> prevent it being used for cross compiling QEMU. Sort the
> DEBIAN_PARTIAL_IMAGE list while we are at it.
>
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
> tests/docker/Makefile.include | 13 +++++++++----
> 1 file changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
> index f4e9dfc0120..8d7f9376578 100644
> --- a/tests/docker/Makefile.include
> +++ b/tests/docker/Makefile.include
> @@ -115,10 +115,15 @@ docker-image-travis: NOUSER=1
> docker-image-tricore-cross: docker-image-debian9
>
> # These images may be good enough for building tests but not for test builds
> -DOCKER_PARTIAL_IMAGES += debian-alpha-cross debian-hppa-cross debian-m68k-cross debian-sh4-cross
> -DOCKER_PARTIAL_IMAGES += debian-sparc64-cross debian-mips64-cross debian-riscv64-cross
> -DOCKER_PARTIAL_IMAGES += debian-tricore-cross debian-powerpc-cross debian-ppc64-cross fedora-i386-cross
> -DOCKER_PARTIAL_IMAGES += fedora-cris-cross
> +DOCKER_PARTIAL_IMAGES += debian-alpha-cross
> +DOCKER_PARTIAL_IMAGES += debian-hppa-cross
> +DOCKER_PARTIAL_IMAGES += debian-m68k-cross debian-mips64-cross
If possible, let's use one image per line
(I think it is acceptable if you do it before your pull
request, no need to respin).
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> +DOCKER_PARTIAL_IMAGES += debian-powerpc-cross debian-ppc64-cross
> +DOCKER_PARTIAL_IMAGES += debian-riscv64-cross
> +DOCKER_PARTIAL_IMAGES += debian-sh4-cross debian-sparc64-cross
> +DOCKER_PARTIAL_IMAGES += debian-tricore-cross
> +DOCKER_PARTIAL_IMAGES += debian-xtensa-cross
> +DOCKER_PARTIAL_IMAGES += fedora-i386-cross fedora-cris-cross
>
> # Rules for building linux-user powered images
> #
>