On 14/9/23 17:54, Alex Bennée wrote:
Bookworm has been out a while now. Time to update our containers to
the current stable. This requires the latest lcitool repo so update
the sub-module too.
For some reason the MIPs containers won't build so skip those for now.
Debian removed mipsel:
https://lists.debian.org/debian-devel-announce/2023/09/msg00000.html
https://lists.debian.org/debian-release/2019/08/msg00582.html ...
Signed-off-by: Alex Bennée <[email protected]>
---
.../dockerfiles/debian-amd64-cross.docker | 10 +++-------
tests/docker/dockerfiles/debian-amd64.docker | 10 +++-------
.../dockerfiles/debian-arm64-cross.docker | 10 +++-------
.../dockerfiles/debian-armel-cross.docker | 10 +++-------
.../dockerfiles/debian-armhf-cross.docker | 10 +++-------
.../dockerfiles/debian-ppc64el-cross.docker | 10 +++-------
.../dockerfiles/debian-s390x-cross.docker | 10 +++-------
tests/docker/dockerfiles/ubuntu2004.docker | 2 +-
tests/docker/dockerfiles/ubuntu2204.docker | 2 +-
tests/lcitool/libvirt-ci | 2 +-
tests/lcitool/refresh | 18 +++++++++---------
11 files changed, 33 insertions(+), 61 deletions(-)
@@ -133,24 +133,24 @@ try:
#
# Cross compiling builds
#
- generate_dockerfile("debian-amd64-cross", "debian-11",
+ generate_dockerfile("debian-amd64-cross", "debian-12",
cross="x86_64",
trailer=cross_build("x86_64-linux-gnu-",
"x86_64-softmmu,"
"x86_64-linux-user,"
"i386-softmmu,i386-linux-user"))
- generate_dockerfile("debian-arm64-cross", "debian-11",
+ generate_dockerfile("debian-arm64-cross", "debian-12",
cross="aarch64",
trailer=cross_build("aarch64-linux-gnu-",
"aarch64-softmmu,aarch64-linux-user"))
- generate_dockerfile("debian-armel-cross", "debian-11",
+ generate_dockerfile("debian-armel-cross", "debian-12",
cross="armv6l",
trailer=cross_build("arm-linux-gnueabi-",
"arm-softmmu,arm-linux-user,armeb-linux-user"))
- generate_dockerfile("debian-armhf-cross", "debian-11",
+ generate_dockerfile("debian-armhf-cross", "debian-12",
cross="armv7l",
trailer=cross_build("arm-linux-gnueabihf-",
"arm-softmmu,arm-linux-user"))
@@ -165,7 +165,7 @@ try:
... so we have to keep bullseye here:
generate_dockerfile("debian-mipsel-cross", "debian-11",
trailer=cross_build("mipsel-linux-gnu-",
"mipsel-softmmu,mipsel-linux-user"))
but the mips64el should work:
generate_dockerfile("debian-mips64el-cross", "debian-12",
cross="mips64el", ...
Anyhow,
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
