motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-04 16:23:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

lcitool: use newer Rust for Debian and Ubuntu

Browse source 
On Debian, the rustc-web package provides a newer Rust compiler (1.78)
for all architectures except mips64el.

On Ubuntu, Rust versions up to 1.80 (?) are available as of this writing
for both Jammy (22.04) and Noble (24.04).  However, the path to rustc
and rustdoc must be provided by hand to the configure script using
either command line arguments or environment variables.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2025-05-02 10:21:42 +02:00
parent a9e0c9c0f1
commit 641f1c5386
15 changed files with 29 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/docker/dockerfiles/debian-amd64-cross.docker
View file

@ -50,7 +50,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-venv \
python3-yaml \
rpm2cpio \
rustc \
rustc-web \
sed \
socat \
sparse \

2
tests/docker/dockerfiles/debian-arm64-cross.docker
View file

@ -50,7 +50,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-venv \
python3-yaml \
rpm2cpio \
rustc \
rustc-web \
sed \
socat \
sparse \

2
tests/docker/dockerfiles/debian-armhf-cross.docker
View file

@ -50,7 +50,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-venv \
python3-yaml \
rpm2cpio \
rustc \
rustc-web \
sed \
socat \
sparse \

2
tests/docker/dockerfiles/debian-i686-cross.docker
View file

@ -50,7 +50,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-venv \
python3-yaml \
rpm2cpio \
rustc \
rustc-web \
sed \
socat \
sparse \

2
tests/docker/dockerfiles/debian-mips64el-cross.docker
View file

@ -50,7 +50,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-venv \
python3-yaml \
rpm2cpio \
rustc \
rustc-web \
sed \
socat \
sparse \

2
tests/docker/dockerfiles/debian-mipsel-cross.docker
View file

@ -50,7 +50,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-venv \
python3-yaml \
rpm2cpio \
rustc \
rustc-web \
sed \
socat \
sparse \

2
tests/docker/dockerfiles/debian-ppc64el-cross.docker
View file

@ -50,7 +50,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-venv \
python3-yaml \
rpm2cpio \
rustc \
rustc-web \
sed \
socat \
sparse \

2
tests/docker/dockerfiles/debian-s390x-cross.docker
View file

@ -50,7 +50,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-venv \
python3-yaml \
rpm2cpio \
rustc \
rustc-web \
sed \
socat \
sparse \

2
tests/docker/dockerfiles/debian.docker
View file

@ -122,7 +122,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-venv \
python3-yaml \
rpm2cpio \
rustc \
rustc-web \
sed \
socat \
sparse \

3
tests/docker/dockerfiles/ubuntu2204.docker
View file

@ -121,7 +121,7 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
python3-venv \
python3-yaml \
rpm2cpio \
rustc \
rustc-1.77 \
sed \
socat \
sparse \
@ -150,6 +150,7 @@ ENV LANG "en_US.UTF-8"
ENV MAKE "/usr/bin/make"
ENV NINJA "/usr/bin/ninja"
ENV PYTHON "/usr/bin/python3"
ENV RUSTC=/usr/bin/rustc-1.77
ENV CARGO_HOME=/usr/local/cargo
ENV PATH=$CARGO_HOME/bin:$PATH
RUN DEBIAN_FRONTEND=noninteractive eatmydata \

5
tests/lcitool/mappings.yml
View file

@ -64,6 +64,11 @@ mappings:
python3-wheel:
OpenSUSELeap15: python311-pip
rust:
Debian12: rustc-web
Ubuntu2204: rustc-1.77
Ubuntu2404: rustc-1.77
pypi_mappings:
# Request more recent version
meson:

5
tests/lcitool/refresh
View file

@ -141,7 +141,8 @@ fedora_rustup_nightly_extras = [
'RUN $CARGO --list\n',
]
ubuntu2204_bindgen_extras = [
ubuntu2204_rust_extras = [
"ENV RUSTC=/usr/bin/rustc-1.77\n",
"ENV CARGO_HOME=/usr/local/cargo\n",
'ENV PATH=$CARGO_HOME/bin:$PATH\n',
"RUN DEBIAN_FRONTEND=noninteractive eatmydata \\\n",
@ -170,7 +171,7 @@ try:
generate_dockerfile("fedora", "fedora-40")
generate_dockerfile("opensuse-leap", "opensuse-leap-15")
generate_dockerfile("ubuntu2204", "ubuntu-2204",
trailer="".join(ubuntu2204_bindgen_extras))
trailer="".join(ubuntu2204_rust_extras))
#
# Non-fatal Rust-enabled build