Re: [PATCH 22/23] dockerfiles: install bindgen from cargo on Ubuntu 22.04

[Pierrick Bouvier <pierrick.bouvier@linaro.org>]

On 10/25/24 09:02, Paolo Bonzini wrote:
> Because Ubuntu 22.04 has a very old version of bindgen, that
> does not have the important option --allowlist-file, it will
> not be able to use --enable-rust out of the box.  Instead,
> install the latest version of bindgen-cli via "cargo install"
> in the container, following QEMU's own documentation.
> 
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>   tests/docker/dockerfiles/ubuntu2204.docker |  5 +++++
>   tests/lcitool/mappings.yml                 |  4 ++++
>   tests/lcitool/refresh                      | 11 ++++++++++-
>   3 files changed, 19 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/docker/dockerfiles/ubuntu2204.docker b/tests/docker/dockerfiles/ubuntu2204.docker
> index ce3aa39d4f3..245ac879622 100644
> --- a/tests/docker/dockerfiles/ubuntu2204.docker
> +++ b/tests/docker/dockerfiles/ubuntu2204.docker
> @@ -149,6 +149,11 @@ ENV LANG "en_US.UTF-8"
>   ENV MAKE "/usr/bin/make"
>   ENV NINJA "/usr/bin/ninja"
>   ENV PYTHON "/usr/bin/python3"
> +ENV CARGO_HOME=/usr/local/cargo
> +ENV PATH=$CARGO_HOME/bin:$PATH
> +RUN DEBIAN_FRONTEND=noninteractive eatmydata \
> +  apt install -y --no-install-recommends cargo
> +RUN cargo install bindgen-cli
>   # As a final step configure the user (if env is defined)
>   ARG USER
>   ARG UID
> diff --git a/tests/lcitool/mappings.yml b/tests/lcitool/mappings.yml
> index 9c5ac87c1c2..c90b23a00f1 100644
> --- a/tests/lcitool/mappings.yml
> +++ b/tests/lcitool/mappings.yml
> @@ -1,4 +1,8 @@
>   mappings:
> +  # Too old on Ubuntu 22.04; we install it from cargo instead
> +  bindgen:
> +    Ubuntu2204:
> +
>     flake8:
>       OpenSUSELeap15:
>   
> diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
> index 0f16f4d525c..a46cbbdca41 100755
> --- a/tests/lcitool/refresh
> +++ b/tests/lcitool/refresh
> @@ -137,6 +137,14 @@ fedora_rustup_nightly_extras = [
>       'RUN /usr/local/cargo/bin/rustup run nightly cargo install bindgen-cli\n',
>   ]
>   
> +ubuntu2204_bindgen_extras = [
> +    "ENV CARGO_HOME=/usr/local/cargo\n",
> +    'ENV PATH=$CARGO_HOME/bin:$PATH\n',
> +    "RUN DEBIAN_FRONTEND=noninteractive eatmydata \\\n",
> +    "  apt install -y --no-install-recommends cargo\n",
> +    'RUN cargo install bindgen-cli\n',
> +]
> +
>   def cross_build(prefix, targets):
>       conf = "ENV QEMU_CONFIGURE_OPTS --cross-prefix=%s\n" % (prefix)
>       targets = "ENV DEF_TARGET_LIST %s\n" % (targets)
> @@ -157,7 +165,8 @@ try:
>                           trailer="".join(debian12_extras))
>       generate_dockerfile("fedora", "fedora-40")
>       generate_dockerfile("opensuse-leap", "opensuse-leap-15")
> -    generate_dockerfile("ubuntu2204", "ubuntu-2204")
> +    generate_dockerfile("ubuntu2204", "ubuntu-2204",
> +                        trailer="".join(ubuntu2204_bindgen_extras))
>   
>       #
>       # Non-fatal Rust-enabled build

Reviewed-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>