From: "Philippe Mathieu-Daudé" <philmd@redhat.com>
To: "Alex Bennée" <alex.bennee@linaro.org>,
"QEMU Developers" <qemu-devel@nongnu.org>
Cc: "Fam Zheng" <fam@euphon.net>,
"Daniel P. Berrangé" <berrange@redhat.com>,
"Stefan Berger" <stefanb@linux.vnet.ibm.com>,
"Richard Henderson" <richard.henderson@linaro.org>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Emilio G. Cota" <cota@braap.org>,
"Stefan Hajnoczi" <stefanha@redhat.com>,
"Marc-André Lureau" <marcandre.lureau@redhat.com>,
"Paolo Bonzini" <pbonzini@redhat.com>,
"Aurelien Jarno" <aurelien@aurel32.net>
Subject: Re: [PATCH v1 12/13] tests/docker: re-enable cross-compiling for x86_64 hosts
Date: Mon, 27 Jan 2020 20:43:07 +0100 [thread overview]
Message-ID: <CAP+75-WZfOeSDjWH+ikuvOZyLz4P25_rFGsFDkGqAr9WNYkCwQ@mail.gmail.com> (raw)
In-Reply-To: <066bd5bc-c6b8-33fe-bcd9-2d4e7172d72d@redhat.com>
On Mon, Jan 27, 2020 at 8:38 PM Philippe Mathieu-Daudé
<philmd@redhat.com> wrote:
> On 1/24/20 9:40 PM, Alex Bennée wrote:
> > Now we have moved everything around we can re-enable the builds for
> > x86_64. Thanks to the descriptive names we are able to sort out QEMU
> > build and tests build dockerfiles and ensure the correct debian
> > dependencies.
> >
> > Move the fedora, mxe and travis dockerfiles into the x86_64 directory
> > as they cannot be used on other architectures.
> >
> > Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> > ---
> > .../dockerfiles.x86_64/Makefile.include | 26 +++++++++++++++++++
> > .../debain10-x86_64-qemu-build.docker | 1 +
> > .../debian10-alpha-build-tests.docker | 1 +
> > .../debian10-amd64-build-qemu.docker | 1 +
> > .../debian10-arm64-build-qemu.docker | 1 +
> > .../debian10-armel-build-qemu.docker | 1 +
> > .../debian10-armhf-build-qemu.docker | 1 +
> > .../debian10-hppa-build-tests.docker | 1 +
> > .../debian10-m68k-build-tests.docker | 1 +
> > .../debian10-mips-build-qemu.docker | 1 +
> > .../debian10-mips64-build-tests.docker | 1 +
> > .../debian10-mips64el-build-qemu.docker | 1 +
> > .../debian10-mipsel-build-qemu.docker | 1 +
> > .../debian10-native-qemu-build.docker | 1 +
> > .../debian10-powerpc-build-tests.docker | 1 +
> > .../debian10-ppc64-build-tests.docker | 1 +
> > .../debian10-ppc64el-build-qemu.docker | 1 +
> > .../debian10-riscv64-build-tests.docker | 1 +
> > .../debian10-s390x-build-qemu.docker | 1 +
> > .../debian10-sh4-build-tests.docker | 1 +
> > .../debian10-sparc64-build-tests.docker | 1 +
> > .../debian9-mxe-win32-build-qemu.docker | 0
> > .../debian9-mxe-win64-build-qemu.docker | 0
> > .../debian9-mxe.docker | 0
> > .../debian9-tricore-build-tests.docker | 1 +
> > .../debian9-xtensa-build-tests.docker | 1 +
> > .../fedora-cris-build-tests.docker | 1 +
> > .../fedora-i386-build-tests.docker | 1 +
> > .../travis.docker | 0
> > 29 files changed, 50 insertions(+)
> > create mode 100644 tests/docker/dockerfiles.x86_64/Makefile.include
> > create mode 120000 tests/docker/dockerfiles.x86_64/debain10-x86_64-qemu-build.docker
> > create mode 120000 tests/docker/dockerfiles.x86_64/debian10-alpha-build-tests.docker
> > create mode 120000 tests/docker/dockerfiles.x86_64/debian10-amd64-build-qemu.docker
> > create mode 120000 tests/docker/dockerfiles.x86_64/debian10-arm64-build-qemu.docker
> > create mode 120000 tests/docker/dockerfiles.x86_64/debian10-armel-build-qemu.docker
> > create mode 120000 tests/docker/dockerfiles.x86_64/debian10-armhf-build-qemu.docker
> > create mode 120000 tests/docker/dockerfiles.x86_64/debian10-hppa-build-tests.docker
> > create mode 120000 tests/docker/dockerfiles.x86_64/debian10-m68k-build-tests.docker
> > create mode 120000 tests/docker/dockerfiles.x86_64/debian10-mips-build-qemu.docker
> > create mode 120000 tests/docker/dockerfiles.x86_64/debian10-mips64-build-tests.docker
> > create mode 120000 tests/docker/dockerfiles.x86_64/debian10-mips64el-build-qemu.docker
> > create mode 120000 tests/docker/dockerfiles.x86_64/debian10-mipsel-build-qemu.docker
> > create mode 120000 tests/docker/dockerfiles.x86_64/debian10-native-qemu-build.docker
> > create mode 120000 tests/docker/dockerfiles.x86_64/debian10-powerpc-build-tests.docker
> > create mode 120000 tests/docker/dockerfiles.x86_64/debian10-ppc64-build-tests.docker
> > create mode 120000 tests/docker/dockerfiles.x86_64/debian10-ppc64el-build-qemu.docker
> > create mode 120000 tests/docker/dockerfiles.x86_64/debian10-riscv64-build-tests.docker
> > create mode 120000 tests/docker/dockerfiles.x86_64/debian10-s390x-build-qemu.docker
> > create mode 120000 tests/docker/dockerfiles.x86_64/debian10-sh4-build-tests.docker
> > create mode 120000 tests/docker/dockerfiles.x86_64/debian10-sparc64-build-tests.docker
> > rename tests/docker/{dockerfiles.cross => dockerfiles.x86_64}/debian9-mxe-win32-build-qemu.docker (100%)
> > rename tests/docker/{dockerfiles.cross => dockerfiles.x86_64}/debian9-mxe-win64-build-qemu.docker (100%)
> > rename tests/docker/{dockerfiles => dockerfiles.x86_64}/debian9-mxe.docker (100%)
> > create mode 120000 tests/docker/dockerfiles.x86_64/debian9-tricore-build-tests.docker
> > create mode 120000 tests/docker/dockerfiles.x86_64/debian9-xtensa-build-tests.docker
> > create mode 120000 tests/docker/dockerfiles.x86_64/fedora-cris-build-tests.docker
> > create mode 120000 tests/docker/dockerfiles.x86_64/fedora-i386-build-tests.docker
> > rename tests/docker/{dockerfiles => dockerfiles.x86_64}/travis.docker (100%)
> >
> > diff --git a/tests/docker/dockerfiles.x86_64/Makefile.include b/tests/docker/dockerfiles.x86_64/Makefile.include
> > new file mode 100644
> > index 0000000000..6237eb500e
> > --- /dev/null
> > +++ b/tests/docker/dockerfiles.x86_64/Makefile.include
> > @@ -0,0 +1,26 @@
> > +# -*- Mode: makefile -*-
> > +#
> > +# x86_64 Containers
> > +#
> > +# This architecture has by far the largest number of cross compilers
> > +# enabled for it.
> > +#
> > +
> > +X86_64_BASE = $(DOCKER_BASE)/dockerfiles.x86_64
> > +VPATH += $(X86_64_BASE)
> > +
> > +#
> > +# We have both QEMU build and TEST build containers we can access
> > +#
> > +QEMU_BUILD_CONTAINERS += $(call get-basenames,$(wildcard $(X86_64_BASE)/*-build-qemu.docker))
> > +TEST_BUILD_CONTAINERS += $(call get-basenames,$(wildcard $(X86_64_BASE)/*-build-tests.docker))
> > +
> > +# Generate build-deps based on names
> > +#
> > +# Most of this architecture are based on Debian images
> > +X86_64_CONTAINERS=$(call get-basenames,$(wildcard $(X86_64_BASE)/*.docker))
> > +$(filter-out,debian9,$(X86_64_CONTAINERS)): docker-image-debian9
> > +$(filter-out,debian10,$(X86_64_CONTAINERS)): docker-image-debian10
> > +
> > +# MXE windows cross compilers are all based on stretch
> > +debian9-mxe-%: docker-image-debian9-mxe
> > diff --git a/tests/docker/dockerfiles.x86_64/debain10-x86_64-qemu-build.docker b/tests/docker/dockerfiles.x86_64/debain10-x86_64-qemu-build.docker
> > new file mode 120000
> > index 0000000000..cd1caa0704
> > --- /dev/null
> > +++ b/tests/docker/dockerfiles.x86_64/debain10-x86_64-qemu-build.docker
> > @@ -0,0 +1 @@
> > +../dockerfiles/debian10-native-qemu-build.docker
> > \ No newline at end of file
> > diff --git a/tests/docker/dockerfiles.x86_64/debian10-alpha-build-tests.docker b/tests/docker/dockerfiles.x86_64/debian10-alpha-build-tests.docker
> > new file mode 120000
> > index 0000000000..614c8525ef
> > --- /dev/null
> > +++ b/tests/docker/dockerfiles.x86_64/debian10-alpha-build-tests.docker
> > @@ -0,0 +1 @@
> > +../dockerfiles.cross/debian10-alpha-build-tests.docker
> > \ No newline at end of file
>
> On Aarch64:
>
> $ make docker-image V=1
> ./tests/docker/docker.py --engine auto build qemu:debian10
> ./tests/docker/dockerfiles.multiarch/debian10.docker --add-current-user
> Sending build context to Docker daemon 3.072kB
> Step 1/5 : FROM debian:buster-slim
> [...]
> Successfully tagged qemu:debian10
> ./tests/docker/docker.py --engine auto build qemu:debian9
> ./tests/docker/dockerfiles.multiarch/debian9.docker --add-current-user
> Image is up to date.
> make: *** No rule to make target
> 'docker-image-debian10-alpha-test-build', needed by 'docker-image'. Stop.
FWIW:
$ make docker-image -k
BUILD debian10
BUILD debian10-aarch64-qemu-build
make: *** No rule to make target
'docker-image-debian10-alpha-test-build', needed by 'docker-image'.
make: *** No rule to make target
'docker-image-debian10-x86_64-qemu-build', needed by 'docker-image'.
BUILD debian9
make: *** No rule to make target
'docker-image-debian9-armel-qemu-build', needed by 'docker-image'.
make: Target 'docker-image' not remade because of errors.
next prev parent reply other threads:[~2020-01-27 19:44 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-24 20:40 [PATCH v1 00/13] docker multiarch awareness Alex Bennée
2020-01-24 20:40 ` [PATCH v1 01/13] tests/docker: move most cross compilers to buster base Alex Bennée
2020-01-24 20:40 ` [PATCH v1 02/13] tests/docker: better handle symlinked libs Alex Bennée
2020-01-27 19:24 ` Philippe Mathieu-Daudé
2020-01-24 20:40 ` [PATCH v1 03/13] gitlab-ci: Refresh the list of iotests Alex Bennée
2020-01-24 20:40 ` [PATCH v1 04/13] travis.yml: Install genisoimage package Alex Bennée
2020-01-24 20:40 ` [PATCH v1 05/13] .shippable: --disable-docs for cross-compile tests Alex Bennée
2020-01-24 20:40 ` [PATCH v1 06/13] tests/docker: move all cross-compilers images into dockerfiles.cross Alex Bennée
2020-01-24 20:40 ` [PATCH v1 07/13] tests/docker: move all multiarch containers into dockerfiles.multiarch Alex Bennée
2020-01-24 20:40 ` [PATCH v1 08/13] tests/docker: search the tests/docker tree to inline parent dockerfile Alex Bennée
2020-01-24 20:40 ` [PATCH v1 09/13] tests/docker: switch to multiarch aware container support Alex Bennée
2020-01-24 20:40 ` [PATCH v1 10/13] tests/docker: add debian10-native-qemu-build Alex Bennée
2020-01-27 19:41 ` Philippe Mathieu-Daudé
2020-01-24 20:40 ` [PATCH v1 11/13] tests/docker: rename the cross builds Alex Bennée
2020-01-24 20:40 ` [PATCH v1 12/13] tests/docker: re-enable cross-compiling for x86_64 hosts Alex Bennée
2020-01-24 22:29 ` Richard Henderson
2020-01-27 18:30 ` Alex Bennée
2020-01-27 19:38 ` Philippe Mathieu-Daudé
2020-01-27 19:43 ` Philippe Mathieu-Daudé [this message]
2020-01-24 20:40 ` [PATCH v1 13/13] tests/docker: enable cross-compilers for aarch64 Alex Bennée
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=CAP+75-WZfOeSDjWH+ikuvOZyLz4P25_rFGsFDkGqAr9WNYkCwQ@mail.gmail.com \
--to=philmd@redhat.com \
--cc=alex.bennee@linaro.org \
--cc=aurelien@aurel32.net \
--cc=berrange@redhat.com \
--cc=cota@braap.org \
--cc=f4bug@amsat.org \
--cc=fam@euphon.net \
--cc=marcandre.lureau@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=richard.henderson@linaro.org \
--cc=stefanb@linux.vnet.ibm.com \
--cc=stefanha@redhat.com \
/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).