We use this container to build system images in CI which do not honour QEMU_CONFIGURE_OPTS. Drop the --disables from the container so developers don not need to jump through hoops trying to replicate that on their workstations.
Signed-off-by: Alex Bennée <[email protected]> --- tests/docker/dockerfiles/debian-all-test-cross.docker | 2 +- tests/lcitool/refresh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/dockerfiles/debian-all-test-cross.docker b/tests/docker/dockerfiles/debian-all-test-cross.docker index 1b01cfe8504..04d424c1a0d 100644 --- a/tests/docker/dockerfiles/debian-all-test-cross.docker +++ b/tests/docker/dockerfiles/debian-all-test-cross.docker @@ -90,7 +90,7 @@ DEBIAN_FRONTEND=noninteractive eatmydata \ apt install -y --no-install-recommends \ ${AVAILABLE_COMPILERS} && \ dpkg-query --showformat '${Package}_${Version}_${Architecture}' --show > /packages.txt -ENV QEMU_CONFIGURE_OPTS --disable-system --disable-docs --disable-tools +ENV QEMU_CONFIGURE_OPTS --disable-docs ENV DEF_TARGET_LIST aarch64-linux-user,arm-linux-user,hppa-linux-user,i386-linux-user,m68k-linux-user,mips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-user,ppc-linux-user,ppc64-linux-user,ppc64le-linux-user,riscv64-linux-user,s390x-linux-user,sparc64-linux-user # As a final step configure the user (if env is defined) ARG USER diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index c5e936112c6..9df607a55f8 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -197,7 +197,7 @@ debian_all_test_cross_compilers = [ "apt install -y --no-install-recommends \\\n", "${AVAILABLE_COMPILERS} && \\\n", "dpkg-query --showformat '${Package}_${Version}_${Architecture}' --show > /packages.txt\n", - "ENV QEMU_CONFIGURE_OPTS --disable-system --disable-docs --disable-tools\n", + "ENV QEMU_CONFIGURE_OPTS --disable-docs\n", "ENV DEF_TARGET_LIST aarch64-linux-user,arm-linux-user,hppa-linux-user,i386-linux-user,m68k-linux-user,mips-linux-user,mips64-linux-user,mips64el-linux-user,mipsel-linux-user,ppc-linux-user,ppc64-linux-user,ppc64le-linux-user,riscv64-linux-user,s390x-linux-user,sparc64-linux-user\n", ] -- 2.47.3
