[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/6] remove remaining traces of meson submodule
|
From: |
Paolo Bonzini |
|
Subject: |
[PATCH 1/6] remove remaining traces of meson submodule |
|
Date: |
Fri, 19 May 2023 10:56:41 +0200 |
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
.gitlab-ci.d/buildtest-template.yml | 4 ----
scripts/archive-source.sh | 2 +-
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/.gitlab-ci.d/buildtest-template.yml
b/.gitlab-ci.d/buildtest-template.yml
index 7edb50b76035..c9f2e737c09a 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 23e042dacdb3..c03532915471 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=""
--
2.40.1
- [PATCH v2 0/6] meson: use subprojects for bundled projects, Paolo Bonzini, 2023/05/19
- [PATCH 1/6] remove remaining traces of meson submodule,
Paolo Bonzini <=
- [PATCH 2/6] meson: simplify logic for -Dfdt, Paolo Bonzini, 2023/05/19
- [PATCH 4/6] meson: use subproject for keycodemapdb, Paolo Bonzini, 2023/05/19
- [PATCH 5/6] configure: rename --enable-pypi to --enable-download, control subprojects too, Paolo Bonzini, 2023/05/19
- [PATCH 6/6] meson: subprojects: replace submodules with wrap files, Paolo Bonzini, 2023/05/19