Now lcitool has been updated to use the non-legacy ENVs we should do the same for what refresh adds.
Reviewed-by: Daniel P. Berrangé <[email protected]> Signed-off-by: Alex Bennée <[email protected]> --- tests/docker/dockerfiles/debian-amd64-cross.docker | 4 ++-- tests/docker/dockerfiles/debian-arm64-cross.docker | 4 ++-- tests/docker/dockerfiles/debian-armhf-cross.docker | 4 ++-- tests/docker/dockerfiles/debian-i686-cross.docker | 4 ++-- tests/docker/dockerfiles/debian-mips64el-cross.docker | 4 ++-- tests/docker/dockerfiles/debian-mipsel-cross.docker | 4 ++-- tests/docker/dockerfiles/debian-ppc64el-cross.docker | 4 ++-- tests/docker/dockerfiles/debian-riscv64-cross.docker | 4 ++-- tests/docker/dockerfiles/debian-s390x-cross.docker | 4 ++-- tests/docker/dockerfiles/debian.docker | 2 +- tests/docker/dockerfiles/fedora-win64-cross.docker | 4 ++-- tests/lcitool/refresh | 6 +++--- 12 files changed, 24 insertions(+), 24 deletions(-) diff --git a/tests/docker/dockerfiles/debian-amd64-cross.docker b/tests/docker/dockerfiles/debian-amd64-cross.docker index 26a39940126..c38ab8247d5 100644 --- a/tests/docker/dockerfiles/debian-amd64-cross.docker +++ b/tests/docker/dockerfiles/debian-amd64-cross.docker @@ -181,8 +181,8 @@ endian = 'little'\n" > /usr/local/share/meson/cross/x86_64-linux-gnu && \ ENV ABI="x86_64-linux-gnu" ENV MESON_OPTS="--cross-file=x86_64-linux-gnu" ENV RUST_TARGET="x86_64-unknown-linux-gnu" -ENV QEMU_CONFIGURE_OPTS --cross-prefix=x86_64-linux-gnu- -ENV DEF_TARGET_LIST x86_64-softmmu,x86_64-linux-user,i386-softmmu,i386-linux-user +ENV QEMU_CONFIGURE_OPTS=--cross-prefix=x86_64-linux-gnu- +ENV DEF_TARGET_LIST=x86_64-softmmu,x86_64-linux-user,i386-softmmu,i386-linux-user # As a final step configure the user (if env is defined) ARG USER ARG UID diff --git a/tests/docker/dockerfiles/debian-arm64-cross.docker b/tests/docker/dockerfiles/debian-arm64-cross.docker index 4b0163fa1b9..2f62da0f5eb 100644 --- a/tests/docker/dockerfiles/debian-arm64-cross.docker +++ b/tests/docker/dockerfiles/debian-arm64-cross.docker @@ -180,8 +180,8 @@ endian = 'little'\n" > /usr/local/share/meson/cross/aarch64-linux-gnu && \ ENV ABI="aarch64-linux-gnu" ENV MESON_OPTS="--cross-file=aarch64-linux-gnu" ENV RUST_TARGET="aarch64-unknown-linux-gnu" -ENV QEMU_CONFIGURE_OPTS --cross-prefix=aarch64-linux-gnu- -ENV DEF_TARGET_LIST aarch64-softmmu,aarch64-linux-user +ENV QEMU_CONFIGURE_OPTS=--cross-prefix=aarch64-linux-gnu- +ENV DEF_TARGET_LIST=aarch64-softmmu,aarch64-linux-user # As a final step configure the user (if env is defined) ARG USER ARG UID diff --git a/tests/docker/dockerfiles/debian-armhf-cross.docker b/tests/docker/dockerfiles/debian-armhf-cross.docker index 742031ce0a2..62e297f5d12 100644 --- a/tests/docker/dockerfiles/debian-armhf-cross.docker +++ b/tests/docker/dockerfiles/debian-armhf-cross.docker @@ -177,8 +177,8 @@ endian = 'little'\n" > /usr/local/share/meson/cross/arm-linux-gnueabihf && \ ENV ABI="arm-linux-gnueabihf" ENV MESON_OPTS="--cross-file=arm-linux-gnueabihf" ENV RUST_TARGET="armv7-unknown-linux-gnueabihf" -ENV QEMU_CONFIGURE_OPTS --cross-prefix=arm-linux-gnueabihf- -ENV DEF_TARGET_LIST arm-softmmu,arm-linux-user +ENV QEMU_CONFIGURE_OPTS=--cross-prefix=arm-linux-gnueabihf- +ENV DEF_TARGET_LIST=arm-softmmu,arm-linux-user # As a final step configure the user (if env is defined) ARG USER ARG UID diff --git a/tests/docker/dockerfiles/debian-i686-cross.docker b/tests/docker/dockerfiles/debian-i686-cross.docker index 1ccfde2e4bb..eb9a915d492 100644 --- a/tests/docker/dockerfiles/debian-i686-cross.docker +++ b/tests/docker/dockerfiles/debian-i686-cross.docker @@ -177,8 +177,8 @@ endian = 'little'\n" > /usr/local/share/meson/cross/i686-linux-gnu && \ ENV ABI="i686-linux-gnu" ENV MESON_OPTS="--cross-file=i686-linux-gnu" ENV RUST_TARGET="i686-unknown-linux-gnu" -ENV QEMU_CONFIGURE_OPTS --cross-prefix=i686-linux-gnu- -ENV DEF_TARGET_LIST i386-softmmu,i386-linux-user +ENV QEMU_CONFIGURE_OPTS=--cross-prefix=i686-linux-gnu- +ENV DEF_TARGET_LIST=i386-softmmu,i386-linux-user # As a final step configure the user (if env is defined) ARG USER ARG UID diff --git a/tests/docker/dockerfiles/debian-mips64el-cross.docker b/tests/docker/dockerfiles/debian-mips64el-cross.docker index eeb77212d5d..42e8444d153 100644 --- a/tests/docker/dockerfiles/debian-mips64el-cross.docker +++ b/tests/docker/dockerfiles/debian-mips64el-cross.docker @@ -176,8 +176,8 @@ endian = 'little'\n" > /usr/local/share/meson/cross/mips64el-linux-gnuabi64 && \ ENV ABI="mips64el-linux-gnuabi64" ENV MESON_OPTS="--cross-file=mips64el-linux-gnuabi64" ENV RUST_TARGET="mips64el-unknown-linux-gnuabi64" -ENV QEMU_CONFIGURE_OPTS --cross-prefix=mips64el-linux-gnuabi64- -ENV DEF_TARGET_LIST mips64el-softmmu,mips64el-linux-user +ENV QEMU_CONFIGURE_OPTS=--cross-prefix=mips64el-linux-gnuabi64- +ENV DEF_TARGET_LIST=mips64el-softmmu,mips64el-linux-user # As a final step configure the user (if env is defined) ARG USER ARG UID diff --git a/tests/docker/dockerfiles/debian-mipsel-cross.docker b/tests/docker/dockerfiles/debian-mipsel-cross.docker index 9b3dca44f15..1ab197b144d 100644 --- a/tests/docker/dockerfiles/debian-mipsel-cross.docker +++ b/tests/docker/dockerfiles/debian-mipsel-cross.docker @@ -176,8 +176,8 @@ endian = 'little'\n" > /usr/local/share/meson/cross/mipsel-linux-gnu && \ ENV ABI="mipsel-linux-gnu" ENV MESON_OPTS="--cross-file=mipsel-linux-gnu" ENV RUST_TARGET="mipsel-unknown-linux-gnu" -ENV QEMU_CONFIGURE_OPTS --cross-prefix=mipsel-linux-gnu- -ENV DEF_TARGET_LIST mipsel-softmmu,mipsel-linux-user +ENV QEMU_CONFIGURE_OPTS=--cross-prefix=mipsel-linux-gnu- +ENV DEF_TARGET_LIST=mipsel-softmmu,mipsel-linux-user # As a final step configure the user (if env is defined) ARG USER ARG UID diff --git a/tests/docker/dockerfiles/debian-ppc64el-cross.docker b/tests/docker/dockerfiles/debian-ppc64el-cross.docker index 15c6b436d31..85d2c0ffdc2 100644 --- a/tests/docker/dockerfiles/debian-ppc64el-cross.docker +++ b/tests/docker/dockerfiles/debian-ppc64el-cross.docker @@ -179,8 +179,8 @@ endian = 'little'\n" > /usr/local/share/meson/cross/powerpc64le-linux-gnu && \ ENV ABI="powerpc64le-linux-gnu" ENV MESON_OPTS="--cross-file=powerpc64le-linux-gnu" ENV RUST_TARGET="powerpc64le-unknown-linux-gnu" -ENV QEMU_CONFIGURE_OPTS --cross-prefix=powerpc64le-linux-gnu- -ENV DEF_TARGET_LIST ppc64-softmmu,ppc64-linux-user +ENV QEMU_CONFIGURE_OPTS=--cross-prefix=powerpc64le-linux-gnu- +ENV DEF_TARGET_LIST=ppc64-softmmu,ppc64-linux-user # As a final step configure the user (if env is defined) ARG USER ARG UID diff --git a/tests/docker/dockerfiles/debian-riscv64-cross.docker b/tests/docker/dockerfiles/debian-riscv64-cross.docker index 2591c4adc96..4f01eecf416 100644 --- a/tests/docker/dockerfiles/debian-riscv64-cross.docker +++ b/tests/docker/dockerfiles/debian-riscv64-cross.docker @@ -179,8 +179,8 @@ endian = 'little'\n" > /usr/local/share/meson/cross/riscv64-linux-gnu && \ ENV ABI="riscv64-linux-gnu" ENV MESON_OPTS="--cross-file=riscv64-linux-gnu" ENV RUST_TARGET="riscv64gc-unknown-linux-gnu" -ENV QEMU_CONFIGURE_OPTS --cross-prefix=riscv64-linux-gnu- -ENV DEF_TARGET_LIST riscv64-softmmu,riscv64-linux-user +ENV QEMU_CONFIGURE_OPTS=--cross-prefix=riscv64-linux-gnu- +ENV DEF_TARGET_LIST=riscv64-softmmu,riscv64-linux-user # As a final step configure the user (if env is defined) ARG USER ARG UID diff --git a/tests/docker/dockerfiles/debian-s390x-cross.docker b/tests/docker/dockerfiles/debian-s390x-cross.docker index 57aa3209c5c..2a3046e7859 100644 --- a/tests/docker/dockerfiles/debian-s390x-cross.docker +++ b/tests/docker/dockerfiles/debian-s390x-cross.docker @@ -178,8 +178,8 @@ endian = 'big'\n" > /usr/local/share/meson/cross/s390x-linux-gnu && \ ENV ABI="s390x-linux-gnu" ENV MESON_OPTS="--cross-file=s390x-linux-gnu" ENV RUST_TARGET="s390x-unknown-linux-gnu" -ENV QEMU_CONFIGURE_OPTS --cross-prefix=s390x-linux-gnu- -ENV DEF_TARGET_LIST s390x-softmmu,s390x-linux-user +ENV QEMU_CONFIGURE_OPTS=--cross-prefix=s390x-linux-gnu- +ENV DEF_TARGET_LIST=s390x-softmmu,s390x-linux-user # As a final step configure the user (if env is defined) ARG USER ARG UID diff --git a/tests/docker/dockerfiles/debian.docker b/tests/docker/dockerfiles/debian.docker index bbb920c6815..c1817f162f6 100644 --- a/tests/docker/dockerfiles/debian.docker +++ b/tests/docker/dockerfiles/debian.docker @@ -169,7 +169,7 @@ RUN cd /usr/src/netmap/LINUX && \ ./configure --no-drivers --no-apps \ --kernel-dir=$(ls -d /usr/src/linux-headers-*-$(dpkg --print-architecture)) \ && make install -ENV QEMU_CONFIGURE_OPTS --enable-netmap +ENV QEMU_CONFIGURE_OPTS=--enable-netmap # As a final step configure the user (if env is defined) ARG USER ARG UID diff --git a/tests/docker/dockerfiles/fedora-win64-cross.docker b/tests/docker/dockerfiles/fedora-win64-cross.docker index e6f84dd556f..1da425768fc 100644 --- a/tests/docker/dockerfiles/fedora-win64-cross.docker +++ b/tests/docker/dockerfiles/fedora-win64-cross.docker @@ -112,8 +112,8 @@ RUN nosync dnf install -y \ ENV ABI="x86_64-w64-mingw32" ENV MESON_OPTS="--cross-file=/usr/share/mingw/toolchain-mingw64.meson" -ENV QEMU_CONFIGURE_OPTS --cross-prefix=x86_64-w64-mingw32- -ENV DEF_TARGET_LIST x86_64-softmmu +ENV QEMU_CONFIGURE_OPTS=--cross-prefix=x86_64-w64-mingw32- +ENV DEF_TARGET_LIST=x86_64-softmmu # As a final step configure the user (if env is defined) ARG USER ARG UID diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index df186caffe6..3a31fcfee9c 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -121,7 +121,7 @@ debian13_extras = [ " ./configure --no-drivers --no-apps \\\n", " --kernel-dir=$(ls -d /usr/src/linux-headers-*-$(dpkg --print-architecture)) \\\n", " && make install\n", - "ENV QEMU_CONFIGURE_OPTS --enable-netmap\n" + "ENV QEMU_CONFIGURE_OPTS=--enable-netmap\n" ] # Based on the hub.docker.com/library/rust Dockerfiles @@ -162,8 +162,8 @@ ubuntu2204_rust_extras = [ ] def cross_build(prefix, targets): - conf = "ENV QEMU_CONFIGURE_OPTS --cross-prefix=%s\n" % (prefix) - targets = "ENV DEF_TARGET_LIST %s\n" % (targets) + conf = "ENV QEMU_CONFIGURE_OPTS=--cross-prefix=%s\n" % (prefix) + targets = "ENV DEF_TARGET_LIST=%s\n" % (targets) return "".join([conf, targets]) # -- 2.47.3
