diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2023-05-18 17:52:25 +0200 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2023-05-19 20:09:21 +0200 |
| commit | dde001ef7161a313e4fe43bb522e8ccc02dffa9e (patch) | |
| tree | 2797195e316dc538ef80d644a37aa288e35921ed | |
| parent | f0b95ab6b8192d84338496a0b6fd8f2c08a4a3a8 (diff) | |
remove remaining traces of meson submodule
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | .gitlab-ci.d/buildtest-template.yml | 4 | ||||
| -rwxr-xr-x | scripts/archive-source.sh | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/.gitlab-ci.d/buildtest-template.yml b/.gitlab-ci.d/buildtest-template.yml index 7edb50b760..c9f2e737c0 100644 --- a/.gitlab-ci.d/buildtest-template.yml +++ b/.gitlab-ci.d/buildtest-template.yml @@ -5,10 +5,6 @@ before_script: - JOBS=$(expr $(nproc) + 1) script: - - if test -n "$LD_JOBS"; - then - scripts/git-submodule.sh update meson ; - fi - mkdir build - cd build - ../configure --enable-werror --disable-docs --enable-fdt=system diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh index 23e042dacd..c035329154 100755 --- a/scripts/archive-source.sh +++ b/scripts/archive-source.sh @@ -26,7 +26,7 @@ sub_file="${sub_tdir}/submodule.tar" # independent of what the developer currently has initialized # in their checkout, because the build environment is completely # different to the host OS. -submodules="dtc meson ui/keycodemapdb" +submodules="dtc ui/keycodemapdb" submodules="$submodules tests/fp/berkeley-softfloat-3 tests/fp/berkeley-testfloat-3" sub_deinit="" |