On Mon, Jan 27, 2020 at 8:38 PM Philippe Mathieu-Daudé
<phi...@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.ben...@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.
