* [PATCH 0/2] tests/docker: Fix fedora-i386-cross
@ 2021-09-30 16:36 Richard Henderson
2021-09-30 16:36 ` [PATCH 1/2] tests/docker: Remove fedora-i386-cross from DOCKER_PARTIAL_IMAGES Richard Henderson
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Richard Henderson @ 2021-09-30 16:36 UTC (permalink / raw)
To: qemu-devel
The meson + pkg-config probing issues came up wrt a recent
NBD pull request at the same time as I am trying to reproduce
a gitlab-ci failure with fedora-i386-cross, and ran into
something apparently related.
r~
Richard Henderson (2):
tests/docker: Remove fedora-i386-cross from DOCKER_PARTIAL_IMAGES
tests/docker: Fix fedora-i386-cross
tests/docker/Makefile.include | 2 +-
tests/docker/dockerfiles/fedora-i386-cross.docker | 5 +++--
2 files changed, 4 insertions(+), 3 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] tests/docker: Remove fedora-i386-cross from DOCKER_PARTIAL_IMAGES
2021-09-30 16:36 [PATCH 0/2] tests/docker: Fix fedora-i386-cross Richard Henderson
@ 2021-09-30 16:36 ` Richard Henderson
2021-09-30 17:00 ` Daniel P. Berrangé
2021-09-30 16:36 ` [PATCH 2/2] tests/docker: Fix fedora-i386-cross Richard Henderson
2021-10-05 2:11 ` [PATCH 0/2] " Richard Henderson
2 siblings, 1 reply; 7+ messages in thread
From: Richard Henderson @ 2021-09-30 16:36 UTC (permalink / raw)
To: qemu-devel; +Cc: Thomas Huth, Alex Bennée
The image was upgraded to a full image in ee381b7fe146.
This makes it possible to use docker-test@image syntax
with this container.
Cc: Thomas Huth <thuth@redhat.com>
Cc: Alex Bennée <alex.bennee@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
tests/docker/Makefile.include | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
index ff5d732889..0806c6f726 100644
--- a/tests/docker/Makefile.include
+++ b/tests/docker/Makefile.include
@@ -184,7 +184,7 @@ DOCKER_PARTIAL_IMAGES += debian-riscv64-cross
DOCKER_PARTIAL_IMAGES += debian-sh4-cross debian-sparc64-cross
DOCKER_PARTIAL_IMAGES += debian-tricore-cross
DOCKER_PARTIAL_IMAGES += debian-xtensa-cross
-DOCKER_PARTIAL_IMAGES += fedora-i386-cross fedora-cris-cross
+DOCKER_PARTIAL_IMAGES += fedora-cris-cross
# Rules for building linux-user powered images
#
--
2.25.1
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2] tests/docker: Fix fedora-i386-cross
2021-09-30 16:36 [PATCH 0/2] tests/docker: Fix fedora-i386-cross Richard Henderson
2021-09-30 16:36 ` [PATCH 1/2] tests/docker: Remove fedora-i386-cross from DOCKER_PARTIAL_IMAGES Richard Henderson
@ 2021-09-30 16:36 ` Richard Henderson
2021-09-30 16:54 ` Richard W.M. Jones
2021-09-30 17:01 ` Daniel P. Berrangé
2021-10-05 2:11 ` [PATCH 0/2] " Richard Henderson
2 siblings, 2 replies; 7+ messages in thread
From: Richard Henderson @ 2021-09-30 16:36 UTC (permalink / raw)
To: qemu-devel
Cc: Paolo Bonzini, Alex Bennée, Daniel P . Berrangé,
Richard W . M . Jones
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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] tests/docker: Fix fedora-i386-cross
2021-09-30 16:36 ` [PATCH 2/2] tests/docker: Fix fedora-i386-cross Richard Henderson
@ 2021-09-30 16:54 ` Richard W.M. Jones
2021-09-30 17:01 ` Daniel P. Berrangé
1 sibling, 0 replies; 7+ messages in thread
From: Richard W.M. Jones @ 2021-09-30 16:54 UTC (permalink / raw)
To: Richard Henderson
Cc: Paolo Bonzini, Daniel P . Berrangé, Alex Bennée, qemu-devel
On Thu, Sep 30, 2021 at 12:36:36PM -0400, Richard Henderson wrote:
> 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
While I'm not able to directly test this docker file, I did run the
equivalent commands (PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig ../configure
--cpu=i386 [etc]) and successfully build a 32-bit qemu binary on
Fedora 64-bit host with the multilib libraries installed. Therefore
I'm pretty confident it should work:
Reviewed-by: Richard W.M. Jones <rjones@redhat.com>
Rich.
--
Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones
Read my programming and virtualization blog: http://rwmj.wordpress.com
virt-p2v converts physical machines to virtual machines. Boot with a
live CD or over the network (PXE) and turn machines into KVM guests.
http://libguestfs.org/virt-v2v
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] tests/docker: Remove fedora-i386-cross from DOCKER_PARTIAL_IMAGES
2021-09-30 16:36 ` [PATCH 1/2] tests/docker: Remove fedora-i386-cross from DOCKER_PARTIAL_IMAGES Richard Henderson
@ 2021-09-30 17:00 ` Daniel P. Berrangé
0 siblings, 0 replies; 7+ messages in thread
From: Daniel P. Berrangé @ 2021-09-30 17:00 UTC (permalink / raw)
To: Richard Henderson; +Cc: Thomas Huth, Alex Bennée, qemu-devel
On Thu, Sep 30, 2021 at 12:36:35PM -0400, Richard Henderson wrote:
> The image was upgraded to a full image in ee381b7fe146.
> This makes it possible to use docker-test@image syntax
> with this container.
>
> Cc: Thomas Huth <thuth@redhat.com>
> Cc: Alex Bennée <alex.bennee@linaro.org>
> Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
> ---
> tests/docker/Makefile.include | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] tests/docker: Fix fedora-i386-cross
2021-09-30 16:36 ` [PATCH 2/2] tests/docker: Fix fedora-i386-cross Richard Henderson
2021-09-30 16:54 ` Richard W.M. Jones
@ 2021-09-30 17:01 ` Daniel P. Berrangé
1 sibling, 0 replies; 7+ messages in thread
From: Daniel P. Berrangé @ 2021-09-30 17:01 UTC (permalink / raw)
To: Richard Henderson
Cc: Paolo Bonzini, Alex Bennée, qemu-devel, Richard W . M . Jones
On Thu, Sep 30, 2021 at 12:36:36PM -0400, Richard Henderson wrote:
> 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(-)
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 0/2] tests/docker: Fix fedora-i386-cross
2021-09-30 16:36 [PATCH 0/2] tests/docker: Fix fedora-i386-cross Richard Henderson
2021-09-30 16:36 ` [PATCH 1/2] tests/docker: Remove fedora-i386-cross from DOCKER_PARTIAL_IMAGES Richard Henderson
2021-09-30 16:36 ` [PATCH 2/2] tests/docker: Fix fedora-i386-cross Richard Henderson
@ 2021-10-05 2:11 ` Richard Henderson
2 siblings, 0 replies; 7+ messages in thread
From: Richard Henderson @ 2021-10-05 2:11 UTC (permalink / raw)
To: qemu-devel
On 9/30/21 9:36 AM, Richard Henderson wrote:
> Richard Henderson (2):
> tests/docker: Remove fedora-i386-cross from DOCKER_PARTIAL_IMAGES
> tests/docker: Fix fedora-i386-cross
Queuing to tcg-next, just because I'm preparing a PR.
r~
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-10-05 2:12 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-30 16:36 [PATCH 0/2] tests/docker: Fix fedora-i386-cross Richard Henderson
2021-09-30 16:36 ` [PATCH 1/2] tests/docker: Remove fedora-i386-cross from DOCKER_PARTIAL_IMAGES Richard Henderson
2021-09-30 17:00 ` Daniel P. Berrangé
2021-09-30 16:36 ` [PATCH 2/2] tests/docker: Fix fedora-i386-cross Richard Henderson
2021-09-30 16:54 ` Richard W.M. Jones
2021-09-30 17:01 ` Daniel P. Berrangé
2021-10-05 2:11 ` [PATCH 0/2] " Richard Henderson
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.