Re: [PATCH 3/3] dockerfiles: update CentOS Stream 9 to Python 3.11, Meson to 1.12
| Newsgroups | gmane.comp.emulators.qemu |
|---|---|
| Message-ID | <178698577647.3397024.10486003602144138621.b4-review@b4> |
> Python 3.10, which is a requirement for Meson 1.12.0, was never > packages for CentOS Stream 9 so update directly to 3.11. packaged > > The opensuse-leap-15.yml file was not in use anymore, so delete it > while touching tests/lcitool/targets/. > > Signed-off-by: Paolo Bonzini <[email protected]> > Message-ID: <[email protected]> > > diff --git a/tests/docker/dockerfiles/centos9.docker b/tests/docker/dockerfiles/centos9.docker > index e38cd692db93..8101370a2dbe 100644 > --- a/tests/docker/dockerfiles/centos9.docker > +++ b/tests/docker/dockerfiles/centos9.docker > @@ -95,13 +95,11 @@ RUN dnf --quiet distro-sync -y && \ > pixman-devel \ > pkgconfig \ > pulseaudio-libs-devel \ > - python3 \ > - python3-pip \ > - python3-setuptools \ > - python3-sphinx \ > - python3-sphinx_rtd_theme \ > python3-tomli \ > - python3-wheel \ > + python3.11 \ > + python3.11-pip \ > + python3.11-setuptools \ > + python3.11-wheel \ > rdma-core-devel \ > rust \ > rust-std-static \ > @@ -131,11 +129,15 @@ RUN dnf --quiet distro-sync -y && \ > ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/clang && \ > ln -s /usr/bin/ccache /usr/libexec/ccache-wrappers/gcc > > +RUN /usr/bin/pip3.11 install \ > + sphinx \ > + sphinx-rtd-theme Since it's a rust-enabled container, why not pip install meson 1.12 here? -- Marc-André Lureau <[email protected]>