On 04/19/2018 11:57 PM, Fam Zheng wrote:
> On Thu, 04/19 23:40, Philippe Mathieu-Daudé wrote:
>> Like the other images, this one is also used to cross-compile.
>> Name it accordingly, matching directory pattern.
>>
>> Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
>> ---
>> tests/docker/Makefile.include | 2 +-
>> .../{debian-amd64.docker => debian-amd64-cross.docker} | 0
>> 2 files changed, 1 insertion(+), 1 deletion(-)
>> rename tests/docker/dockerfiles/{debian-amd64.docker =>
>> debian-amd64-cross.docker} (100%)
>>
>> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
>> index de87341528..a113a15f77 100644
>> --- a/tests/docker/Makefile.include
>> +++ b/tests/docker/Makefile.include
>> @@ -49,7 +49,7 @@ docker-image-debian-powerpc-cross:
>> EXTRA_FILES:=$(SRC_PATH)/tests/docker/dockerf
>> # Enforce dependancies for composite images
>> docker-image-debian: docker-image-debian9
>> docker-image-debian8-mxe: docker-image-debian8
>> -docker-image-debian-amd64: docker-image-debian9
>> +docker-image-debian-amd64-cross: docker-image-debian9
>> docker-image-debian-armel-cross: docker-image-debian9
>> docker-image-debian-armhf-cross: docker-image-debian9
>> docker-image-debian-arm64-cross: docker-image-debian9
>> diff --git a/tests/docker/dockerfiles/debian-amd64.docker
>> b/tests/docker/dockerfiles/debian-amd64-cross.docker
>> similarity index 100%
>> rename from tests/docker/dockerfiles/debian-amd64.docker
>> rename to tests/docker/dockerfiles/debian-amd64-cross.docker
>
> But the dockerfile is written differently: it doesn't use the --cross-prefix
> configure option, plus, amd64 is usually the "native" arch making it non-cross
> build.
Indeed, the goal of this dockerfile is to let a developer build QEMU
with as much dependencies as possible, without having to install them on
his own workstation.
> What do you need this patch for beside the consistency?
I was thinking it might be easier for Alex to use these images in his
last series "fix building of tests/tcg" (having the same pattern).
On another hand I'm trying to cross-build on a arm32v7 host to be able
to natively run 32-bit qtests [1]. But for that this patch is incomplete.
[1]:
https://github.com/docker-library/official-images#architectures-other-than-amd64
Regards,
Phil.
