mirror of https://github.com/xemu-project/xemu.git
tests/docker/dockerfiles: Bump fedora-i386-cross to fedora 34
For unknown and unrepeatable reasons, the cross-i386-tci test has started failing. "Fix" this by updating the container to use fedora 34. Add sysprof-capture-devel as a new dependency of glib2-devel that was not correctly spelled out in the rpm rules. Use dnf update Just In Case -- there are presently out-of-date packages in the upstream docker registry. Reviewed-by: Paolo Bonzini <pbonzini@redhat.com> Message-Id: <20211005205846.153724-1-richard.henderson@linaro.org> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
parent
274f9a381c
commit
e3acc2c196
|
@ -1,4 +1,5 @@
|
||||||
FROM registry.fedoraproject.org/fedora:33
|
FROM registry.fedoraproject.org/fedora:34
|
||||||
|
|
||||||
ENV PACKAGES \
|
ENV PACKAGES \
|
||||||
bzip2 \
|
bzip2 \
|
||||||
ccache \
|
ccache \
|
||||||
|
@ -19,10 +20,11 @@ ENV PACKAGES \
|
||||||
nettle-devel.i686 \
|
nettle-devel.i686 \
|
||||||
perl-Test-Harness \
|
perl-Test-Harness \
|
||||||
pixman-devel.i686 \
|
pixman-devel.i686 \
|
||||||
|
sysprof-capture-devel.i686 \
|
||||||
zlib-devel.i686
|
zlib-devel.i686
|
||||||
|
|
||||||
ENV QEMU_CONFIGURE_OPTS --extra-cflags=-m32 --disable-vhost-user
|
ENV QEMU_CONFIGURE_OPTS --extra-cflags=-m32 --disable-vhost-user
|
||||||
ENV PKG_CONFIG_PATH /usr/lib/pkgconfig
|
ENV PKG_CONFIG_PATH /usr/lib/pkgconfig
|
||||||
|
|
||||||
RUN dnf install -y $PACKAGES
|
RUN dnf update -y && dnf install -y $PACKAGES
|
||||||
RUN rpm -q $PACKAGES | sort > /packages.txt
|
RUN rpm -q $PACKAGES | sort > /packages.txt
|
||||||
|
|
Loading…
Reference in New Issue