From 616a5e5d0bf442d7df1c93c71c0b5a7cf3245552 Mon Sep 17 00:00:00 2001 From: Matt Borgerson Date: Thu, 2 Jan 2025 17:59:17 -0700 Subject: [PATCH] archive-source.sh: Support subprojects that specify directory different from wrapfile --- scripts/archive-source.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh index 580a4b17a5..bff2f5d2f5 100755 --- 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