[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v1 11/42] tests/docker: move our arm64 cross com
From: |
Philippe Mathieu-Daudé |
Subject: |
Re: [Qemu-devel] [PATCH v1 11/42] tests/docker: move our arm64 cross compile to Buster |
Date: |
Sat, 7 Sep 2019 13:26:50 +0200 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.0 |
On 9/5/19 12:35 PM, Philippe Mathieu-Daudé wrote:
> On 9/4/19 10:29 PM, Alex Bennée wrote:
>> Now Buster is released we can unify our cross build images for both
>> QEMU and tests.
>>
>> Signed-off-by: Alex Bennée <address@hidden>
>> ---
>> tests/docker/Makefile.include | 5 ++---
>> .../docker/dockerfiles/debian-arm64-cross.docker | 4 ++--
>> .../dockerfiles/debian-buster-arm64-cross.docker | 16 ----------------
>> tests/tcg/configure.sh | 2 +-
>> 4 files changed, 5 insertions(+), 22 deletions(-)
>> delete mode 100644 tests/docker/dockerfiles/debian-buster-arm64-cross.docker
>>
>> diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include
>> index 89881fb5f5d..48c22ae40c0 100644
>> --- a/tests/docker/Makefile.include
>> +++ b/tests/docker/Makefile.include
>> @@ -86,13 +86,10 @@ docker-binfmt-image-debian-%:
>> $(DOCKER_FILES_DIR)/debian-bootstrap.docker
>> endif
>>
>> # Enforce dependencies for composite images
>> -docker-image-debian: docker-image-debian9
>> docker-image-debian9-mxe: docker-image-debian9
>> docker-image-debian-amd64: docker-image-debian9
>> docker-image-debian-armel-cross: docker-image-debian9
>> docker-image-debian-armhf-cross: docker-image-debian9
>> -docker-image-debian-arm64-cross: docker-image-debian9
>> -docker-image-debian-buster-arm64-cross: docker-image-debian10
>> docker-image-debian-mips-cross: docker-image-debian9
>> docker-image-debian-mipsel-cross: docker-image-debian9
>> docker-image-debian-mips64el-cross: docker-image-debian9
>> @@ -101,6 +98,8 @@ docker-image-debian-s390x-cross: docker-image-debian9
>> docker-image-debian-win32-cross: docker-image-debian9-mxe
>> docker-image-debian-win64-cross: docker-image-debian9-mxe
>>
>> +docker-image-debian-arm64-cross: docker-image-debian10
>> +
>> docker-image-debian-alpha-cross: docker-image-debian-sid
>> docker-image-debian-hppa-cross: docker-image-debian-sid
>> docker-image-debian-m68k-cross: docker-image-debian-sid
>> diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker
>> b/tests/docker/dockerfiles/debian-arm64-cross.docker
>> index 6b59ef0843a..55045ff5d5a 100644
>> --- a/tests/docker/dockerfiles/debian-arm64-cross.docker
>> +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker
>> @@ -1,9 +1,9 @@
>> #
>> # Docker arm64 cross-compiler target
>> #
>> -# This docker target builds on the debian Stretch base image.
>> +# This docker target builds on the debian Buster base image.
>> #
>> -FROM qemu:debian9
>> +FROM qemu:debian10
>>
>> # Add the foreign architecture we want and install dependencies
>> RUN dpkg --add-architecture arm64
>> diff --git a/tests/docker/dockerfiles/debian-buster-arm64-cross.docker
>> b/tests/docker/dockerfiles/debian-buster-arm64-cross.docker
>> deleted file mode 100644
>> index 52787edcc2c..00000000000
>> --- a/tests/docker/dockerfiles/debian-buster-arm64-cross.docker
>> +++ /dev/null
>> @@ -1,16 +0,0 @@
>> -#
>> -# Docker arm64 cross-compiler target
>> -#
>> -# This docker target builds on the Debian's Buster base image. There
>> -# are no QEMU pre-requistes so this image can only be used to build
>> -# test cases.
>> -#
>> -FROM qemu:debian10
>> -
>> -# Add the foreign architecture we want and install dependencies
>> -RUN dpkg --add-architecture arm64
>> -RUN apt update && \
>> - DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata && \
>> - DEBIAN_FRONTEND=noninteractive eatmydata \
>> - apt-get install -y --no-install-recommends \
>> - crossbuild-essential-arm64
>> diff --git a/tests/tcg/configure.sh b/tests/tcg/configure.sh
>> index 5f794b664b8..2a351a00048 100755
>> --- a/tests/tcg/configure.sh
>> +++ b/tests/tcg/configure.sh
>> @@ -95,7 +95,7 @@ for target in $target_list; do
>> case $target in
>> aarch64-*)
>> # We don't have any bigendian build tools so we only use this for
>> AArch64
>> - container_image=debian-buster-arm64-cross
>> + container_image=debian-arm64-cross
>> container_cross_cc=aarch64-linux-gnu-gcc
>> ;;
>> alpha-*)
>>
>
> Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Tested-by: Philippe Mathieu-Daudé <address@hidden>
- [Qemu-devel] [PATCH v1 04/42] tests/tcg: use EXTRA_CFLAGS everywhere, (continued)
- [Qemu-devel] [PATCH v1 04/42] tests/tcg: use EXTRA_CFLAGS everywhere, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 30/42] .travis.yml: Enable multiple caching features, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 05/42] tests/tcg: cleanup Makefile inclusions, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 14/42] tests/docker: move our HPPA cross compile to Buster, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 07/42] tests/tcg: add .gitignore for in source builds, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 29/42] configure: check if --no-pie is supported first, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 08/42] tests/docker: move DEF_TARGET_LIST setting to common.rc, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 11/42] tests/docker: move our arm64 cross compile to Buster, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 15/42] tests/docker: move our m68k cross compile to Buster, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 09/42] tests/docker: set DEF_TARGET_LIST for some containers, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 13/42] tests/docker: move our Alpha cross compile to Buster, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 19/42] tests/docker: move our riscv64 cross compile to Buster, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 12/42] tests/docker: move our powerpc cross compile to Buster, Alex Bennée, 2019/09/04
- [Qemu-devel] [PATCH v1 24/42] tests/docker: add debian9-mxe to DEBIAN_PARTIAL_IMAGES, Alex Bennée, 2019/09/04