| Message ID | 20190904203013.9028-12-alex.bennee@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | current testing/next queue (podman, docker, ci) | expand |
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 <alex.bennee@linaro.org> > --- > 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é <philmd@redhat.com>
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 <alex.bennee@linaro.org> >> --- >> 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é <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com>
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-*)
Now Buster is released we can unify our cross build images for both QEMU and tests. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> --- 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 -- 2.20.1