1. Patchew
  2. QEMU
  3. [PATCH v2 00/58] Remove 32-bit host support
  4. View patch

[PATCH v2 06/58] tests/docker/dockerfiles: Drop wasm32 from emsdk-wasm-cross.docker

Richard Henderson posted 58 patches 3 weeks, 1 day ago
Maintainers: "Alex Bennée" <alex.bennee@linaro.org>, "Philippe Mathieu-Daudé" <philmd@linaro.org>, Thomas Huth <thuth@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>, Fabiano Rosas <farosas@suse.de>, Laurent Vivier <lvivier@redhat.com>, Richard Henderson <richard.henderson@linaro.org>, Riku Voipio <riku.voipio@iki.fi>, Stefan Hajnoczi <stefanha@redhat.com>, Fam Zheng <fam@euphon.net>, Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>, Warner Losh <imp@bsdimp.com>, Kyle Evans <kevans@freebsd.org>, "Daniel P. Berrangé" <berrange@redhat.com>, Stefano Stabellini <sstabellini@kernel.org>, Anthony PERARD <anthony@xenproject.org>, Paul Durrant <paul@xen.org>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, "Michael S. Tsirkin" <mst@redhat.com>, David Hildenbrand <david@kernel.org>, "Marc-André Lureau" <marcandre.lureau@redhat.com>, Peter Xu <peterx@redhat.com>, Li Zhijian <lizhijian@fujitsu.com>, Hyman Huang <yong.huang@smartx.com>, Peter Maydell <peter.maydell@linaro.org>, Helge Deller <deller@gmx.de>, Zhao Liu <zhao1.liu@intel.com>, Eduardo Habkost <eduardo@habkost.net>, Palmer Dabbelt <palmer@dabbelt.com>, Alistair Francis <alistair.francis@wdc.com>, Weiwei Li <liwei1518@gmail.com>, Daniel Henrique Barboza <dbarboza@ventanamicro.com>, Liu Zhiwei <zhiwei_liu@linux.alibaba.com>, Ilya Leoshkevich <iii@linux.ibm.com>, WANG Xuerui <git@xen0n.name>, Stefan Weil <sw@weilnetz.de>, Kohei Tokunaga <ktokunaga.mail@gmail.com>
[PATCH v2 06/58] tests/docker/dockerfiles: Drop wasm32 from emsdk-wasm-cross.docker
Posted by Richard Henderson 3 weeks, 1 day ago 
We will no longer build wasm32, so drop the docker config.
Streamline the dockerfile to hardcode TARGET_CPU as wasm64.

Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
 .gitlab-ci.d/container-cross.yml                 |  1 -
 tests/docker/dockerfiles/emsdk-wasm-cross.docker | 15 ++++-----------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.d/container-cross.yml b/.gitlab-ci.d/container-cross.yml
index 6bdd482b80..b376c837dc 100644
--- a/.gitlab-ci.d/container-cross.yml
+++ b/.gitlab-ci.d/container-cross.yml
@@ -90,5 +90,4 @@ wasm64-emsdk-cross-container:
   extends: .container_job_template
   variables:
     NAME: emsdk-wasm64-cross
-    BUILD_ARGS: --build-arg TARGET_CPU=wasm64
     DOCKERFILE: emsdk-wasm-cross
diff --git a/tests/docker/dockerfiles/emsdk-wasm-cross.docker b/tests/docker/dockerfiles/emsdk-wasm-cross.docker
index ecd5a02903..8a924816f9 100644
--- a/tests/docker/dockerfiles/emsdk-wasm-cross.docker
+++ b/tests/docker/dockerfiles/emsdk-wasm-cross.docker
@@ -7,7 +7,6 @@ ARG GLIB_VERSION=${GLIB_MINOR_VERSION}.0
 ARG PIXMAN_VERSION=0.44.2
 ARG FFI_VERSION=v3.5.2
 ARG MESON_VERSION=1.5.0
-ARG TARGET_CPU=wasm32
 
 FROM docker.io/emscripten/emsdk:$EMSDK_VERSION_QEMU AS build-base-common
 ARG MESON_VERSION
@@ -31,21 +30,16 @@ RUN mkdir /build
 WORKDIR /build
 RUN mkdir -p $TARGET
 
-FROM build-base-common AS build-base-wasm32
-
-FROM build-base-common AS build-base-wasm64
+FROM build-base-common AS build-base
 ENV CFLAGS="$CFLAGS -sMEMORY64=1"
 ENV CXXFLAGS="$CXXFLAGS -sMEMORY64=1"
 ENV LDFLAGS="$LDFLAGS -sMEMORY64=1"
-
-FROM build-base-${TARGET_CPU} AS build-base
-ARG TARGET_CPU
 RUN <<EOF
 cat <<EOT > /cross.meson
 [host_machine]
 system = 'emscripten'
-cpu_family = '${TARGET_CPU}'
-cpu = '${TARGET_CPU}'
+cpu_family = 'wasm64'
+cpu = 'wasm64'
 endian = 'little'
 
 [binaries]
@@ -67,14 +61,13 @@ RUN emconfigure ./configure --prefix=$TARGET --static
 RUN emmake make install -j$(nproc)
 
 FROM build-base AS libffi-dev
-ARG TARGET_CPU
 ARG FFI_VERSION
 RUN mkdir -p /libffi
 RUN git clone https://github.com/libffi/libffi /libffi
 WORKDIR /libffi
 RUN git checkout $FFI_VERSION
 RUN autoreconf -fiv
-RUN emconfigure ./configure --host=${TARGET_CPU}-unknown-linux \
+RUN emconfigure ./configure --host=wasm64-unknown-linux \
     --prefix=$TARGET --enable-static \
     --disable-shared --disable-dependency-tracking \
     --disable-builddir --disable-multi-os-directory \
-- 
2.43.0
Re: [PATCH v2 06/58] tests/docker/dockerfiles: Drop wasm32 from emsdk-wasm-cross.docker
Posted by Kohei Tokunaga 3 weeks ago 
> We will no longer build wasm32, so drop the docker config.
> Streamline the dockerfile to hardcode TARGET_CPU as wasm64.
>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
>  .gitlab-ci.d/container-cross.yml                 |  1 -
>  tests/docker/dockerfiles/emsdk-wasm-cross.docker | 15 ++++-----------
>  2 files changed, 4 insertions(+), 12 deletions(-)
>
> diff --git a/.gitlab-ci.d/container-cross.yml
b/.gitlab-ci.d/container-cross.yml
> index 6bdd482b80..b376c837dc 100644
> --- a/.gitlab-ci.d/container-cross.yml
> +++ b/.gitlab-ci.d/container-cross.yml
> @@ -90,5 +90,4 @@ wasm64-emsdk-cross-container:
>    extends: .container_job_template
>    variables:
>      NAME: emsdk-wasm64-cross
> -    BUILD_ARGS: --build-arg TARGET_CPU=wasm64
>      DOCKERFILE: emsdk-wasm-cross
> diff --git a/tests/docker/dockerfiles/emsdk-wasm-cross.docker
b/tests/docker/dockerfiles/emsdk-wasm-cross.docker
> index ecd5a02903..8a924816f9 100644
> --- a/tests/docker/dockerfiles/emsdk-wasm-cross.docker
> +++ b/tests/docker/dockerfiles/emsdk-wasm-cross.docker
> @@ -7,7 +7,6 @@ ARG GLIB_VERSION=${GLIB_MINOR_VERSION}.0
>  ARG PIXMAN_VERSION=0.44.2
>  ARG FFI_VERSION=v3.5.2
>  ARG MESON_VERSION=1.5.0
> -ARG TARGET_CPU=wasm32
>
>  FROM docker.io/emscripten/emsdk:$EMSDK_VERSION_QEMU AS build-base-common
>  ARG MESON_VERSION
> @@ -31,21 +30,16 @@ RUN mkdir /build
>  WORKDIR /build
>  RUN mkdir -p $TARGET
>
> -FROM build-base-common AS build-base-wasm32
> -
> -FROM build-base-common AS build-base-wasm64
> +FROM build-base-common AS build-base
>  ENV CFLAGS="$CFLAGS -sMEMORY64=1"
>  ENV CXXFLAGS="$CXXFLAGS -sMEMORY64=1"
>  ENV LDFLAGS="$LDFLAGS -sMEMORY64=1"
> -
> -FROM build-base-${TARGET_CPU} AS build-base
> -ARG TARGET_CPU
>  RUN <<EOF
>  cat <<EOT > /cross.meson
>  [host_machine]
>  system = 'emscripten'
> -cpu_family = '${TARGET_CPU}'
> -cpu = '${TARGET_CPU}'
> +cpu_family = 'wasm64'
> +cpu = 'wasm64'
>  endian = 'little'
>
>  [binaries]
> @@ -67,14 +61,13 @@ RUN emconfigure ./configure --prefix=$TARGET --static
>  RUN emmake make install -j$(nproc)
>
>  FROM build-base AS libffi-dev
> -ARG TARGET_CPU
>  ARG FFI_VERSION
>  RUN mkdir -p /libffi
>  RUN git clone https://github.com/libffi/libffi /libffi
>  WORKDIR /libffi
>  RUN git checkout $FFI_VERSION
>  RUN autoreconf -fiv
> -RUN emconfigure ./configure --host=${TARGET_CPU}-unknown-linux \
> +RUN emconfigure ./configure --host=wasm64-unknown-linux \
>      --prefix=$TARGET --enable-static \
>      --disable-shared --disable-dependency-tracking \
>      --disable-builddir --disable-multi-os-directory \

Reviewed-by: Kohei Tokunaga <ktokunaga.mail@gmail.com>

Patchew 2.1-devel-b67e4c2

© 2016 - 2026 Red Hat, Inc.