archive-source.sh: Support subprojects that specify directory differe…

…nt from wrapfile
xemu-project · Jan 3, 2025 · e4fffc4 · e4fffc4
1 parent 2b9541a
commit e4fffc4
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh
@@ -60,8 +60,9 @@ test $? -ne 0 && error "failed to archive qemu"
 
 for sp in $subprojects; do
     meson subprojects download $sp
+    sp_dir=$(grep -oP '^directory = \K.*' subprojects/${sp}.wrap || echo ${sp})
     # test $? -ne 0 && error "failed to download subproject $sp"
-    tar --append --file "$tar_file" --exclude=.git subprojects/$sp
+    tar --append --file "$tar_file" --exclude=.git subprojects/$sp_dir
     test $? -ne 0 && error "failed to append subproject $sp to $tar_file"
 done