On 2/17/21 6:23 PM, Alessandro Di Federico via wrote: > On Sun, 14 Feb 2021 19:50:41 +0100 > Philippe Mathieu-Daudé <f4...@amsat.org> wrote: > >> Hi Alessandro! > > Hi Philippe! > >> I had to add this to build your image with QEMU build system: >> >> -- >8 -- >> >> diff --git a/tests/docker/Makefile.include >> b/tests/docker/Makefile.include index 93b29ad823e..ba73fb4b1f0 100644 >> --- a/tests/docker/Makefile.include >> +++ b/tests/docker/Makefile.include >> @@ -146,6 +146,8 @@ docker-image-debian-riscv64-cross: >> docker-image-debian10 docker-image-debian-s390x-cross: >> docker-image-debian10 docker-image-debian-sh4-cross: >> docker-image-debian10 docker-image-debian-sparc64-cross: >> docker-image-debian10 >> +docker-image-debian-hexagon-cross-build-local: >> \ >> + >> EXTRA_FILES:=$(SRC_PATH)/tests/docker/dockerfiles/debian-hexagon-cross.build-toolchain.sh >> >> docker-image-travis: NOUSER=1 >> >> --- > > OK, I'll drop `-local` (see below). > >>> +++ b/tests/docker/dockerfiles/debian-hexagon-cross.docker >>> @@ -0,0 +1 @@ >>> +FROM revng/qemu:debian-hexagon-cross >> >> Once this patch gets merged, the image will be available on >> qemu/qemu:debian-hexagon-cross. >> >> I suppose for the final merge patch we want: >> - rm debian-hexagon-cross.docker >> - mv debian-hexagon-cross-build-local.docker >> debian-hexagon-cross.docker >> >> Is that correct? > > The `revng/qemu:debian-hexagon-cross` image was there only to let > people quickly try out a toolchain without building it from source.
OK, not obvious from the commit description ;) > If building from source is OK with you, that works for us. > In any case, people will be able to use > `qemu/qemu:debian-hexagon-cross`, right? If you add a job to build it (see .gitlab-ci.d/containers.yml) it will then be pushed to the Gitlab QEMU namespace. So Yes. When we need a Docker image to build things, we first try to pull from QEMU namespace, then build locally if not available (see tests/docker/Makefile.include). >> If so, can you amend that detail after the '---' >> separator of the commit description so we don't merge this patch >> as it? > > I'm a bit confused, do you want me to send a patch corrected by hand > here? > I'll send a new patch tomorrow. I basically meant, "If this is the case and you want to keep it as it, please describe this better, so this patch doesn't get merged". >> Also, can you add a job to build your image in >> .gitlab-ci.d/containers.yml? > > OK, is there a quick way for me to test changes I make to that file? Open a Gitlab account, clone QEMU, push your change :) https://wiki.qemu.org/Testing/CI/GitLabCI Regards, Phil.
