On Fri, 04/20 00:41, Philippe Mathieu-Daudé wrote: > 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.
That is quite useful. BTW I think we should mention *which* images can build QEMU with the most complete dependencies in docs/devel/testing.rst, and I'd make sure we use that one on patchew. However there are opinions that such an image should maintain a list of package names instead of "$pkg_manager build-dep qemu", to avoid dependencies and assumptions on how downstreams build QEMU, and I'm with that idea. Currently fedora.docker has a very long list of packages and people try to make it complete, but last time I audited it, what I remember is a couple packages can be found on ubuntu/debian are missing on Fedora. This needs more close look. I don't have a strong preference about distro family, but considering the maintanence capacity we should focus on one image first and encourage developers to add packages to the (one) image when a new dependency is introduced, especially since that patchew doesn't have much horsepower for a whole lot of redundancy. > > > 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). > I see. I'll leave this to you and Alex to decide. Fam