From 0873ce1bd00d7a9896612be291b054ab9d6a640b Mon Sep 17 00:00:00 2001
From: DmitriyMusatkin <musatkd@amazon.com>
Date: Fri, 3 Jan 2025 10:43:05 -0800
Subject: [PATCH] that

---
 codebuild/cd/musl-arm64-build.yml | 1 -
 codebuild/cd/musl-linux-build.sh  | 7 ++++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/codebuild/cd/musl-arm64-build.yml b/codebuild/cd/musl-arm64-build.yml
index c92464fa8..70bfc402a 100644
--- a/codebuild/cd/musl-arm64-build.yml
+++ b/codebuild/cd/musl-arm64-build.yml
@@ -2,7 +2,6 @@ version: 0.2
 phases:
   install:
     commands:
-      - sudo yum install -y qemu-user qemu-user-static binfmt-support
   pre_build:
     commands:
       - export CC=gcc
diff --git a/codebuild/cd/musl-linux-build.sh b/codebuild/cd/musl-linux-build.sh
index d8558f0e2..eb3e208c3 100755
--- a/codebuild/cd/musl-linux-build.sh
+++ b/codebuild/cd/musl-linux-build.sh
@@ -15,9 +15,10 @@ echo "Using builder version ${BUILDER_VERSION}"
 
 aws ecr get-login-password | docker login 123124136734.dkr.ecr.us-east-1.amazonaws.com -u AWS --password-stdin
 export DOCKER_IMAGE=123124136734.dkr.ecr.us-east-1.amazonaws.com/${IMAGE_NAME}:${BUILDER_VERSION}
-#export QEMU_IMAGE=123124136734.dkr.ecr.us-east-1.amazonaws.com/multiarch-qemu-user-static:latest
-#docker run --rm --privileged ${QEMU_IMAGE} --reset -p yes
-docker run --rm --privileged multiarch/qemu-user-static --reset -p yes
+export QEMU_IMAGE=123124136734.dkr.ecr.us-east-1.amazonaws.com/multiarch-qemu-user-static:latest
+
+docker run --rm --privileged ${QEMU_IMAGE} --reset -p yes
+docker run --rm --privileged ${QEMU_IMAGE} --reset -p yes
 
 export BRANCH_TAG=$(git describe --tags)
 docker run --mount type=bind,src=$(pwd),dst=/root/aws-crt-java --env AWS_DEFAULT_REGION --env CXXFLAGS --env AWS_CRT_ARCH --platform=${PLATFORM} $DOCKER_IMAGE --version=${BUILDER_VERSION} build -p aws-crt-java --classifier ${CLASSIFIER} --branch ${BRANCH_TAG} run_tests=false