scripts: Add aarch64 support to containerized build

This commit adds aarch64 support to containerized build and test. The
integration tests are not yet supported for aarch64.

Signed-off-by: Akira Moroo <[email protected]>

Author: retrage

scripts/dev_cli.sh

@@ -233,6 +233,7 @@ cmd_help() {
 }
 
 cmd_build() {
+    arch="$(uname -m)"
     build="debug"
     features_build=""
     exported_device="dev/kvm"
@@ -258,20 +259,22 @@ cmd_build() {
 
     process_volumes_args
 
+    [ "$arch" = "aarch64" ] && target="aarch64-unknown-none.json"
+    [ "$arch" = "x86_64" ] && target="x86_64-unknown-none.json"
+
     cargo_args=("$@")
     [ $build = "release" ] && cargo_args+=("--release")
 
     rustflags=""
 
     $DOCKER_RUNTIME run \
-	   --user "$(id -u):$(id -g)" \
 	   --workdir "$CTR_RHF_ROOT_DIR" \
 	   --rm \
 	   --volume $exported_device \
 	   --volume "$RHF_ROOT_DIR:$CTR_RHF_ROOT_DIR" $exported_volumes \
 	   --env RUSTFLAGS="$rustflags" \
 	   "$CTR_IMAGE" \
-	   cargo build --target "x86_64-unknown-none.json" \
+	   cargo build --target "$target" \
 	         -Zbuild-std=core,alloc \
 	         -Zbuild-std-features=compiler-builtins-mem \
 	         --target-dir "$CTR_RHF_CARGO_TARGET" \
@@ -285,7 +288,6 @@ cmd_clean() {
     ensure_latest_ctr
 
     $DOCKER_RUNTIME run \
-	   --user "$(id -u):$(id -g)" \
 	   --workdir "$CTR_RHF_ROOT_DIR" \
 	   --rm \
 	   --volume "$RHF_ROOT_DIR:$CTR_RHF_ROOT_DIR" $exported_volumes \
@@ -296,6 +298,7 @@ cmd_clean() {
 }
 
 cmd_tests() {
+    arch="$(uname -m)"
     unit=false
     cargo=false
     integration=false
@@ -315,7 +318,7 @@ cmd_tests() {
                 shift
                 arg_vols="$1"
                 ;;
-            "--all")                 { cargo=true; unit=true; integration=true; } ;;
+            "--all")                 { cargo=true; unit=true;  [ "$arch" = "x86_64" ] && integration=true; } ;;
             "--")                    { shift; break; } ;;
             *)
 		die "Unknown tests argument: $1. Please use --help for help."
@@ -324,6 +327,18 @@ cmd_tests() {
 	shift
     done
 
+    if [ "$(uname -m)" = "aarch64" ] ; then
+        if [ "$integration" = true ] ; then
+            die "Integration test is not supported for aarch64."
+        fi
+        if [ "$integration_coreboot" = true ] ; then
+            die "coreboot integration test is not supported for aarch64."
+        fi
+        if [ "$integration_windows" = true ] ; then
+            die "Windows integration test is not supported for aarch64."
+        fi
+    fi
+
     ensure_build_dir
     ensure_latest_ctr
 
@@ -409,6 +424,8 @@ cmd_tests() {
 
 
 cmd_build-container() {
+    arch="$(uname -m)"
+
     while [ $# -gt 0 ]; do
 	case "$1" in
             "-h"|"--help")  { cmd_help; exit 1; } ;;
@@ -427,7 +444,8 @@ cmd_build-container() {
     mkdir -p $BUILD_DIR
     cp $RHF_DOCKERFILE $BUILD_DIR
 
-    [ $(uname -m) = "x86_64" ] && TARGETARCH="amd64"
+    [ "$arch" = "aarch64" ] && TARGETARCH="arm64"
+    [ "$arch" = "x86_64" ] && TARGETARCH="amd64"
     RUST_TOOLCHAIN="$(rustup show active-toolchain | cut -d ' ' -f1)"
 
     $DOCKER_RUNTIME build \

scripts/run_cargo_tests.sh

@@ -6,17 +6,37 @@ source "${CARGO_HOME:-$HOME/.cargo}/env"
 
 export RUSTFLAGS="-D warnings"
 
+arch="$(uname -m)"
+
+do_cargo_tests() {
+    local cargo_args=("-Zbuild-std=core,alloc" "-Zbuild-std-features=compiler-builtins-mem")
+    local cmd="$1"
+    local target="$2"
+    local features="$3"
+    [ -n "$features" ] && cargo_args+=("--features" "$features")
+    time cargo "$cmd" --target "$target" "${cargo_args[@]}"
+    time cargo "$cmd" --target "$target" --release "${cargo_args[@]}"
+}
+
+cargo_tests() {
+    local features="$1"
+
+    [ "$arch" = "aarch64" ] && target="aarch64-unknown-none.json"
+    [ "$arch" = "x86_64" ] && target="x86_64-unknown-none.json"
+
+    do_cargo_tests "build" "$target" "$features"
+    do_cargo_tests "clippy" "$target" "$features"
+}
+
 # Install cargo components
 time rustup component add clippy
 time rustup component add rustfmt
 time rustup component add rust-src
 
 # Run cargo builds and checks
-time cargo build --target x86_64-unknown-none.json -Zbuild-std=core,alloc -Zbuild-std-features=compiler-builtins-mem
-time cargo build --release --target x86_64-unknown-none.json -Zbuild-std=core,alloc -Zbuild-std-features=compiler-builtins-mem
-time cargo build --target x86_64-unknown-none.json --features "coreboot" -Zbuild-std=core,alloc -Zbuild-std-features=compiler-builtins-mem
-time cargo build --release --target x86_64-unknown-none.json --features "coreboot" -Zbuild-std=core,alloc -Zbuild-std-features=compiler-builtins-mem
-time cargo clippy --target x86_64-unknown-none.json -Zbuild-std=core,alloc
-time cargo clippy --target x86_64-unknown-none.json -Zbuild-std=core,alloc --features "coreboot"
+cargo_tests ""
+if [ "$arch" = "x86_64" ] ; then
+    cargo_tests "coreboot"
+fi
 time cargo clippy --all-targets --all-features
 time cargo fmt --all -- --check