Re: [PATCH v8 35/35] Add Dockerfile for hexagon

[Philippe Mathieu-Daudé]

Hi Alessandro!

On 2/8/21 6:46 AM, Taylor Simpson wrote:
> From: Alessandro Di Federico <ale@rev.ng>
> 
> Signed-off-by: Alessandro Di Federico <ale@rev.ng>
> Tested-by: Taylor Simpson <tsimpson@quicinc.com>
> ---
>  .../debian-hexagon-cross-build-local.docker        |  18 +++
>  .../debian-hexagon-cross.build-toolchain.sh        | 141 
> +++++++++++++++++++++
>  .../docker/dockerfiles/debian-hexagon-cross.docker |   1 +
>  tests/tcg/configure.sh                             |   4 +
>  4 files changed, 164 insertions(+)
>  create mode 100644 
> tests/docker/dockerfiles/debian-hexagon-cross-build-local.docker
>  create mode 100755 
> tests/docker/dockerfiles/debian-hexagon-cross.build-toolchain.sh
>  create mode 100644 tests/docker/dockerfiles/debian-hexagon-cross.docker
> 
> diff --git a/tests/docker/dockerfiles/debian-hexagon-cross-build-local.docker 
> b/tests/docker/dockerfiles/debian-hexagon-cross-build-local.docker
> new file mode 100644
> index 0000000..355adbf
> --- /dev/null
> +++ b/tests/docker/dockerfiles/debian-hexagon-cross-build-local.docker
> @@ -0,0 +1,18 @@
> +FROM debian:10
> +
> +RUN apt update && \
> +    DEBIAN_FRONTEND=noninteractive \
> +    apt install -y --no-install-recommends \
> +        ca-certificates build-essential cmake clang lld ninja-build \
> +     flex bison pkg-config wget python3 rsync
> +
> +ENV TOOLCHAIN_INSTALL /usr
> +ENV ROOTFS /usr
> +
> +ENV LLVM_URL 
> https://github.com/llvm/llvm-project/archive/3d8149c2a1228609fd7d7c91a04681304a2f0ca9.tar.gz
> +ENV MUSL_URL 
> https://github.com/quic/musl/archive/aff74b395fbf59cd7e93b3691905aa1af6c0778c.tar.gz
> +ENV LINUX_URL 
> https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.6.18.tar.xz
> +
> +COPY debian-hexagon-cross.build-toolchain.sh /root/hexagon-toolchain/

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

---

> +++ 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? If so, can you amend that detail after the '---'
separator of the commit description so we don't merge this patch
as it?

Also, can you add a job to build your image in .gitlab-ci.d/containers.yml?

Meanwhile:
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

Regards,

Phil.