From b723c3b14714ffb78fe2805537244af0c17da96f Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=B5=9C=ED=98=95=EA=B7=9C/=EB=8F=99=EC=9E=91=EC=A0=9C?= =?utf8?q?=EC=96=B4Lab=28SR=29/Senior=20Engineer/=EC=82=BC=EC=84=B1?= =?utf8?q?=EC=A0=84=EC=9E=90?= Date: Wed, 9 May 2018 10:24:29 +0900 Subject: [PATCH] Update scripts for cross build (#1122) * Update scripts for cross build - Update docker_build_cross_arm_ubuntu.sh with changes in docker_build_cross_arm_ubuntu_without_aclbuild.sh Signed-off-by: Hyung-Kyu Choi --- scripts/command/docker_build_cross_arm_ubuntu.sh | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/scripts/command/docker_build_cross_arm_ubuntu.sh b/scripts/command/docker_build_cross_arm_ubuntu.sh index fb3ac81..7595ed0 100755 --- a/scripts/command/docker_build_cross_arm_ubuntu.sh +++ b/scripts/command/docker_build_cross_arm_ubuntu.sh @@ -15,11 +15,18 @@ DOCKER_ENV_VARS+=" -e http_proxy" DOCKER_ENV_VARS+=" -e no_proxy" DOCKER_ENV_VARS+=" -e GIT_SSL_NO_VERIFY" +DOCKER_ENV_VARS+=" -e TARGET_ARCH=armv7l" +DOCKER_ENV_VARS+=" -e CROSS_BUILD=1" + DOCKER_RUN_OPTS="--rm" DOCKER_RUN_OPTS+=" -w $DOCKER_HOME" -DOCKER_RUN_OPTS+=" -it" -CMD="export TARGET_ARCH=armv7l && export CROSS_BUILD=1 && export BENCHMARK_ACL_BUILD=1 && make acl && make && make install" +if [ -n "$DOCKER_INTERACTIVE" ]; then + DOCKER_RUN_OPTS+=" -it" + CMD="/bin/bash" +else + CMD="export BENCHMARK_ACL_BUILD=1 && make acl && make && make install && make build_test_suite" +fi docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME sh -c "$CMD" BUILD_RESULT=$? -- 2.7.4