| Message ID | 20240628124258.832466-2-alex.bennee@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | July maintainer updates (32bit, testing, plugins, gdbstub) | expand |
On 6/28/24 05:42, Alex Bennée wrote: > I guess we never noticed and tried to build with this cross image. Fix > the toolchain prefix so we actually build 32 bit images. > > Signed-off-by: Alex Bennée<alex.bennee@linaro.org> > --- > tests/docker/dockerfiles/debian-i686-cross.docker | 2 +- > tests/lcitool/refresh | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) OMG. Reviewed-by: Richard Henderson <richard.henderson@linaro.org> r~
diff --git a/tests/docker/dockerfiles/debian-i686-cross.docker b/tests/docker/dockerfiles/debian-i686-cross.docker index f1e5b0b877..f4ef054a2e 100644 --- a/tests/docker/dockerfiles/debian-i686-cross.docker +++ b/tests/docker/dockerfiles/debian-i686-cross.docker @@ -169,7 +169,7 @@ 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 QEMU_CONFIGURE_OPTS --cross-prefix=x86_64-linux-gnu- +ENV QEMU_CONFIGURE_OPTS --cross-prefix=i686-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 diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh index b25e3ac4dd..ac803e34f1 100755 --- a/tests/lcitool/refresh +++ b/tests/lcitool/refresh @@ -167,7 +167,7 @@ try: generate_dockerfile("debian-i686-cross", "debian-11", cross="i686", - trailer=cross_build("x86_64-linux-gnu-", + trailer=cross_build("i686-linux-gnu-", "x86_64-softmmu," "x86_64-linux-user," "i386-softmmu,i386-linux-user"))
I guess we never noticed and tried to build with this cross image. Fix the toolchain prefix so we actually build 32 bit images. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> --- tests/docker/dockerfiles/debian-i686-cross.docker | 2 +- tests/lcitool/refresh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)