On 9/10/26 08:14, Alex Bennée wrote:
This cleans up a few bits and pieces although doesn't totally solve
the issue of an apparent stall while meson builds the docker image.
However with these changes there should be no difference between the
meson build and the equivalent "make docker-image-foo" invocation.

We also finally get rid of the ill-advised magic caching support in
docker.py.

Please review.

Alex.

Alex Bennée (8):
   scripts/meson-buildoptions.sh: update missing options
   tests/tcg: prefix meson built docker tags with qemu/
   tests/tcg: use --add-current-user when building containers
   tests/docker: add container registry to configure and use
   tests/docker: remove used _read_qemu_dockerfile
   tests/docker: strip remaining caching logic from docker.py
   tests/docker: add specific command to parser
   tests/docker: swap --quiet for --verbose

Something in here breaks things badly:

$ make
/home/rth/qemu/bld/pyvenv/bin/meson introspect --buildoptions /home/rth/qemu/src/meson.build | /home/rth/qemu/bld/pyvenv/bin/python3 -B \ scripts/meson-buildoptions.py > /home/rth/qemu/src/scripts/meson-buildoptions.sh.tmp && mv /home/rth/qemu/src/scripts/meson-buildoptions.sh.tmp /home/rth/qemu/src/scripts/meson-buildoptions.sh
Failure in scripts/meson-buildoptions.py parsing stdin as json

../src/meson.build:96:12: ERROR: Unknown compiler(s): [['rustc']]
The following exception(s) were encountered:
Running `rustc --version` gave "[Errno 2] No such file or directory: 'rustc'"

make: *** [Makefile:134: /home/rth/qemu/src/scripts/meson-buildoptions.sh] Error 1


r~

Reply via email to