[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/2] tests/docker: Fix fedora-i386-cross
From: |
Richard Henderson |
Subject: |
[PATCH 2/2] tests/docker: Fix fedora-i386-cross |
Date: |
Fri, 1 Oct 2021 11:33:40 -0400 |
By using PKG_CONFIG_PATH instead of PKG_CONFIG_LIBDIR,
we were still including the 64-bit packages. Install
pcre-devel.i686 to fill a missing glib2 dependency.
By using --extra-cflags instead of --cpu, we incorrectly
use the wrong probing during meson.
Cc: Alex Bennée <alex.bennee@linaro.org>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Daniel P. Berrangé <berrange@redhat.com>
Cc: Richard W.M. Jones <rjones@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
tests/docker/dockerfiles/fedora-i386-cross.docker | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tests/docker/dockerfiles/fedora-i386-cross.docker
b/tests/docker/dockerfiles/fedora-i386-cross.docker
index dbb8195eb1..820740d5be 100644
--- a/tests/docker/dockerfiles/fedora-i386-cross.docker
+++ b/tests/docker/dockerfiles/fedora-i386-cross.docker
@@ -17,12 +17,13 @@ ENV PACKAGES \
glibc-static.i686 \
gnutls-devel.i686 \
nettle-devel.i686 \
+ pcre-devel.i686 \
perl-Test-Harness \
pixman-devel.i686 \
zlib-devel.i686
-ENV QEMU_CONFIGURE_OPTS --extra-cflags=-m32 --disable-vhost-user
-ENV PKG_CONFIG_PATH /usr/lib/pkgconfig
+ENV QEMU_CONFIGURE_OPTS --cpu=i386 --disable-vhost-user
+ENV PKG_CONFIG_LIBDIR /usr/lib/pkgconfig
RUN dnf install -y $PACKAGES
RUN rpm -q $PACKAGES | sort > /packages.txt
--
2.25.1
- [PATCH 0/9] nios2: Enable cross compile and fix signals, Richard Henderson, 2021/10/01
- [PATCH 2/2] tests/docker: Fix fedora-i386-cross,
Richard Henderson <=
- [PATCH 2/9] linux-user/nios2: Properly emulate EXCP_TRAP, Richard Henderson, 2021/10/01
- [PATCH 3/9] linux-user/nios2: Fixes for signal frame setup, Richard Henderson, 2021/10/01
- [PATCH 4/9] linux-user/elfload: Rename ARM_COMMPAGE to HI_COMMPAGE, Richard Henderson, 2021/10/01
- [PATCH 1/2] tests/docker: Remove fedora-i386-cross from DOCKER_PARTIAL_IMAGES, Richard Henderson, 2021/10/01
- [PATCH 5/9] linux-user/nios2: Map a real kuser page, Richard Henderson, 2021/10/01