build/debian: Add `-w` to keep temp workdir for debugging am: 26c4ef35de am: c18ec98a2d
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/3381985
Change-Id: I576974689dbfdc34c1eb285d5936daede14a0f4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/build/debian/build.sh b/build/debian/build.sh
index cf229aa..bd918dd 100755
--- a/build/debian/build.sh
+++ b/build/debian/build.sh
@@ -12,6 +12,7 @@
echo "-h Print usage and this help message and exit."
echo "-a ARCH Architecture of the image [default is aarch64]"
echo "-r Release mode build"
+ echo "-w Save temp work directory (for debugging)"
}
check_sudo() {
@@ -22,7 +23,7 @@
}
parse_options() {
- while getopts "hra:" option; do
+ while getopts "a:hrw" option; do
case ${option} in
h)
show_help
@@ -40,6 +41,9 @@
r)
mode=release
;;
+ w)
+ save_workdir=1
+ ;;
*)
echo "Invalid option: $OPTARG"
exit
@@ -213,7 +217,7 @@
}
clean_up() {
- rm -rf "${workdir}"
+ [ "$save_workdir" -eq 0 ] || rm -rf "${workdir}"
}
set -e
@@ -229,6 +233,7 @@
arch=aarch64
debian_arch=arm64
mode=debug
+save_workdir=0
parse_options "$@"
check_sudo
diff --git a/build/debian/build_in_container.sh b/build/debian/build_in_container.sh
index ef64254..7fd4c00 100755
--- a/build/debian/build_in_container.sh
+++ b/build/debian/build_in_container.sh
@@ -4,7 +4,9 @@
arch=aarch64
release_flag=
-while getopts "ra:" option; do
+save_workdir_flag=
+
+while getopts "a:rw" option; do
case ${option} in
a)
if [[ "$OPTARG" != "aarch64" && "$OPTARG" != "x86_64" ]]; then
@@ -16,6 +18,9 @@
r)
release_flag="-r"
;;
+ w)
+ save_workdir_flag="-w"
+ ;;
*)
echo "Invalid option: $OPTARG"
exit
@@ -27,4 +32,4 @@
-v "$ANDROID_BUILD_TOP/packages/modules/Virtualization:/root/Virtualization" \
--workdir /root/Virtualization/build/debian \
ubuntu:22.04 \
- bash -c "/root/Virtualization/build/debian/build.sh -a "$arch" $release_flag || bash"
+ bash -c "/root/Virtualization/build/debian/build.sh -a $arch $release_flag $save_workdir_flag || bash"