build/debian: Several improvements to build scripts
- Consistently `exit 1` in place of `exit` at errors
- Default to host machine arch, instead of aarch64
- Identical Kokoro build scripts for aarch64 and x86_64 due to the above
- Better error message¹ for ANDROID_BUILD_TOP in containerized build
- `-s` flag for build_in_container.sh to unconditionally leave a shell open for further testing
¹ ANDROID_BUILD_TOP is not set by only running `source build/envsetup.sh`. Additionally, a target must be `lunch`ed to set this variable.
Bug: None
Test: ./build_in_container.sh -s -w
Change-Id: Iec28c7f0d582fc5fdbbe9700cb759b1f3278a514
diff --git a/build/debian/build.sh b/build/debian/build.sh
index 7231a7c..9eb478b 100755
--- a/build/debian/build.sh
+++ b/build/debian/build.sh
@@ -10,15 +10,14 @@
echo "Builds a debian image and save it to FILE. [sudo is required]"
echo "Options:"
echo "-h Print usage and this help message and exit."
- echo "-a ARCH Architecture of the image [default is aarch64]"
+ echo "-a ARCH Architecture of the image [default is host arch: $(uname -m)]"
echo "-r Release mode build"
- echo "-w Save temp work directory (for debugging)"
+ echo "-w Save temp work directory [for debugging]"
}
check_sudo() {
if [ "$EUID" -ne 0 ]; then
- echo "Please run as root."
- exit
+ echo "Please run as root." ; exit 1
fi
}
@@ -26,17 +25,10 @@
while getopts "a:hrw" option; do
case ${option} in
h)
- show_help
- exit;;
+ show_help ; exit
+ ;;
a)
- if [[ "$OPTARG" != "aarch64" && "$OPTARG" != "x86_64" ]]; then
- echo "Invalid architecture: $OPTARG"
- exit
- fi
arch="$OPTARG"
- if [[ "$arch" == "x86_64" ]]; then
- debian_arch="amd64"
- fi
;;
r)
mode=release
@@ -45,11 +37,21 @@
save_workdir=1
;;
*)
- echo "Invalid option: $OPTARG"
- exit
+ echo "Invalid option: $OPTARG" ; exit 1
;;
esac
done
+ case "$arch" in
+ aarch64)
+ debian_arch="arm64"
+ ;;
+ x86_64)
+ debian_arch="amd64"
+ ;;
+ *)
+ echo "Invalid architecture: $arch" ; exit 1
+ ;;
+ esac
if [[ "${*:$OPTIND:1}" ]]; then
built_image="${*:$OPTIND:1}"
fi
@@ -217,7 +219,7 @@
}
clean_up() {
- [ "$save_workdir" -eq 0 ] || rm -rf "${workdir}"
+ [ "$save_workdir" -eq 1 ] || rm -rf "${workdir}"
}
set -e
@@ -230,8 +232,7 @@
debian_version=bookworm
config_space=${debian_cloud_image}/config_space/${debian_version}
resources_dir=${debian_cloud_image}/src/debian_cloud_images/resources
-arch=aarch64
-debian_arch=arm64
+arch="$(uname -m)"
mode=debug
save_workdir=0