| Message ID | 20230308000745.56394-2-philmd@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | MIPS Virt machine | expand |
On 08/03/2023 01.07, Philippe Mathieu-Daudé wrote: > With the introduction of the MIPS virt machine in a pair > of commits, all MIPS targets will require libfdt. > Since the 'build-without-defaults' job is configured with > '--disable-fdt', it won't be able to build any MIPS target. > In particular this job triggers: > > ../meson.build:2809:2: ERROR: Problem encountered: fdt not available but required by targets mips64-softmmu > > Remove 'mips64-softmmu' from the job TARGETS. > To still cover a big-endian target in qtests, replace it by > the s390x target. > > Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> > --- > .gitlab-ci.d/buildtest.yml | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml > index 44b8275299..4897229f1a 100644 > --- a/.gitlab-ci.d/buildtest.yml > +++ b/.gitlab-ci.d/buildtest.yml > @@ -526,9 +526,9 @@ build-without-defaults: > --disable-pie > --disable-qom-cast-debug > --disable-strip > - TARGETS: avr-softmmu mips64-softmmu s390x-softmmu sh4-softmmu > + TARGETS: avr-softmmu s390x-softmmu sh4-softmmu > sparc64-softmmu hexagon-linux-user i386-linux-user s390x-linux-user > - MAKE_CHECK_ARGS: check-unit check-qtest-avr check-qtest-mips64 > + MAKE_CHECK_ARGS: check-unit check-qtest-avr check-qtest-s390x Did you check whether this really works? IIRC the qtests fail with s390x if it is compiled with --without-default-devices ...? Thomas
diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 44b8275299..4897229f1a 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -526,9 +526,9 @@ build-without-defaults: --disable-pie --disable-qom-cast-debug --disable-strip - TARGETS: avr-softmmu mips64-softmmu s390x-softmmu sh4-softmmu + TARGETS: avr-softmmu s390x-softmmu sh4-softmmu sparc64-softmmu hexagon-linux-user i386-linux-user s390x-linux-user - MAKE_CHECK_ARGS: check-unit check-qtest-avr check-qtest-mips64 + MAKE_CHECK_ARGS: check-unit check-qtest-avr check-qtest-s390x build-libvhost-user: extends: .base_job_template
With the introduction of the MIPS virt machine in a pair of commits, all MIPS targets will require libfdt. Since the 'build-without-defaults' job is configured with '--disable-fdt', it won't be able to build any MIPS target. In particular this job triggers: ../meson.build:2809:2: ERROR: Problem encountered: fdt not available but required by targets mips64-softmmu Remove 'mips64-softmmu' from the job TARGETS. To still cover a big-endian target in qtests, replace it by the s390x target. Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org> --- .gitlab-ci.d/buildtest.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)