From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: pbonzini@redhat.com, alex.bennee@linaro.org
Subject: [PATCH] tests/docker/dockerfiles: Bump fedora-i386-cross to fedora 34
Date: Tue, 5 Oct 2021 13:58:46 -0700 [thread overview]
Message-ID: <20211005205846.153724-1-richard.henderson@linaro.org> (raw)
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.
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
tests/docker/dockerfiles/fedora-i386-cross.docker | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker b/tests/docker/dockerfiles/fedora-i386-cross.docker
index 820740d5be..f62a71ce22 100644
--- a/tests/docker/dockerfiles/fedora-i386-cross.docker
+++ b/tests/docker/dockerfiles/fedora-i386-cross.docker
@@ -1,4 +1,5 @@
-FROM registry.fedoraproject.org/fedora:33
+FROM registry.fedoraproject.org/fedora:34
+
ENV PACKAGES \
bzip2 \
ccache \
@@ -20,10 +21,11 @@ ENV PACKAGES \
pcre-devel.i686 \
perl-Test-Harness \
pixman-devel.i686 \
+ sysprof-capture-devel.i686 \
zlib-devel.i686
ENV QEMU_CONFIGURE_OPTS --cpu=i386 --disable-vhost-user
ENV PKG_CONFIG_LIBDIR /usr/lib/pkgconfig
-RUN dnf install -y $PACKAGES
+RUN dnf update -y && dnf install -y $PACKAGES
RUN rpm -q $PACKAGES | sort > /packages.txt
--
2.25.1
next reply other threads:[~2021-10-05 21:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-05 20:58 Richard Henderson [this message]
2021-10-05 22:16 ` [PATCH] tests/docker/dockerfiles: Bump fedora-i386-cross to fedora 34 Paolo Bonzini
2021-10-06 1:25 ` Richard Henderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211005205846.153724-1-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=alex.bennee@linaro.org \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).