From: Marc-André Lureau <[email protected]>
Signed-off-by: Marc-André Lureau <[email protected]>
---
scripts/archive-source.sh | 30 ++++++++++++++++++++++--------
1 file changed, 22 insertions(+), 8 deletions(-)
diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh
index 68eb9672de..f55130ec34 100755
--- a/scripts/archive-source.sh
+++ b/scripts/archive-source.sh
@@ -26,12 +26,26 @@ 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.
-subprojects="keycodemapdb libvfio-user berkeley-softfloat-3
- berkeley-testfloat-3 anyhow-1-rs arbitrary-int-1-rs bilge-0.2-rs
- bilge-impl-0.2-rs either-1-rs foreign-0.3-rs itertools-0.11-rs
- libc-0.2-rs proc-macro2-1-rs
- proc-macro-error-1-rs proc-macro-error-attr-1-rs quote-1-rs
- syn-2-rs unicode-ident-1-rs"
+subprojects=(
+ anyhow-1-rs
+ arbitrary-int-1-rs
+ berkeley-softfloat-3
+ berkeley-testfloat-3
+ bilge-0.2-rs
+ bilge-impl-0.2-rs
+ either-1-rs
+ foreign-0.3-rs
+ itertools-0.11-rs
+ keycodemapdb
+ libc-0.2-rs
+ libvfio-user
+ proc-macro-error-1-rs
+ proc-macro-error-attr-1-rs
+ proc-macro2-1-rs
+ quote-1-rs
+ syn-2-rs
+ unicode-ident-1-rs
+)
sub_deinit=""
function cleanup() {
@@ -77,10 +91,10 @@ function subproject_dir() {
git archive --format tar "$(tree_ish)" > "$tar_file"
test $? -ne 0 && error "failed to archive qemu"
-meson subprojects download $subprojects >/dev/null
+meson subprojects download ${subprojects[@]} >/dev/null
test $? -ne 0 && error "failed to download subprojects $subprojects"
-for sp in $subprojects; do
+for sp in "${subprojects[@]}"; do
tar --append --file "$tar_file" --exclude=.git
subprojects/"$(subproject_dir $sp)"
test $? -ne 0 && error "failed to append subproject $sp to $tar_file"
done
--
2.51.0
