Revise tizen build script (#3393)

- Revise tizen cross build script
- Revise tizen gbs build script

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>

diff --git a/scripts/command/docker_build_tizen_cross.sh b/scripts/command/docker_build_tizen_cross.sh
index 3a45cfd..3a55ce4 100755 (executable)
--- a/scripts/command/docker_build_tizen_cross.sh
+++ b/scripts/command/docker_build_tizen_cross.sh
@@ -1,22 +1,10 @@
 #!/bin/bash
 
-SCRIPT_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-# DOCKER_HOME and DOCKER_ENV_VARS
-source $SCRIPT_ROOT/nnfw_docker
-
-HOST_HOME=$SCRIPT_ROOT/../..
-
-DOCKER_VOLUMES+=" -v $HOST_HOME:$DOCKER_HOME"
-
 DOCKER_ENV_VARS+=" -e TARGET_ARCH=armv7l"
 DOCKER_ENV_VARS+=" -e CROSS_BUILD=1"
 DOCKER_ENV_VARS+=" -e ROOTFS_DIR=/opt/rootfs"
 DOCKER_ENV_VARS+=" -e TARGET_OS=tizen"
 
-DOCKER_RUN_OPTS="--rm"
-DOCKER_RUN_OPTS+=" -w $DOCKER_HOME"
-
 # prepare rootfs
 if [[ ! -d $ROOTFS_DIR ]]; then
   echo "cannot find rootfs"
@@ -25,12 +13,15 @@ fi
 
 DOCKER_VOLUMES+=" -v $ROOTFS_DIR/:/opt/rootfs"
 
-CMD="make && make install && make build_test_suite"
+export NNFW_PROJECT_PATH
+export NNFW_SCRIPT_PATH
 
-docker run $DOCKER_RUN_OPTS $DOCKER_ENV_VARS $DOCKER_VOLUMES $DOCKER_IMAGE_NAME sh -c "$CMD"
-BUILD_RESULT=$?
+pushd $NNFW_PROJECT_PATH
+
+CMD="make && make install && make build_test_suite"
+source run docker-run bash -c "${CMD}"
+EXITCODE=$?
 
-source $SCRIPT_ROOT/../docker_helper
-restore_ownership $HOST_HOME $DOCKER_HOME
+popd
 
-exit $BUILD_RESULT
+exit $EXITCODE

diff --git a/scripts/command/docker_gbs_build.sh b/scripts/command/docker_gbs_build.sh
index dcd989e..c04ffe0 100755 (executable)
--- a/scripts/command/docker_gbs_build.sh
+++ b/scripts/command/docker_gbs_build.sh
@@ -1,38 +1,26 @@
 #!/bin/bash
 
-SCRIPT_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-# DOCKER_HOME and DOCKER_ENV_VARS
-source $SCRIPT_ROOT/nnfw_docker_tizen
-
-HOST_HOME=$SCRIPT_ROOT/../..
-DOCKER_NNFW_HOME=${DOCKER_HOME}
-DOCKER_RPM_HOME=/home/rpm
+DOCKER_IMAGE_NAME=${DOCKER_IMAGE_NAME:-nnfw_docker_tizen}
+DOCKER_RPM_HOME=$NNFW_PROJECT_PATH/rpm
 
 if [ "${GBS_RPM_DIR}" == "" ];
 then
-    GBS_RPM_DIR=$HOST_HOME/Product/out/rpm
+    GBS_RPM_DIR=$NNFW_PROJECT_PATH/Product/out/rpm
     mkdir -p ${GBS_RPM_DIR}
 fi
 
-if [ -z ${DOCKER_IMAGE} ];
-then
-    # use default docker image
-    DOCKER_IMAGE=nnfw_docker_tizen:latest
-fi
+DOCKER_VOLUMES+=" -v ${GBS_RPM_DIR}:${DOCKER_RPM_HOME}"
 
+export NNFW_PROJECT_PATH
+export NNFW_SCRIPT_PATH
 
-DOCKER_VOLUMES+=" -v ${GBS_RPM_DIR}:${DOCKER_RPM_HOME} -v $HOST_HOME:${DOCKER_NNFW_HOME}"
-DOCKER_RUN_OPTS+=" --rm"
-DOCKER_RUN_OPTS+=" -w ${DOCKER_NNFW_HOME}"
+pushd $NNFW_PROJECT_PATH
 
-CMD="gbs -c ${DOCKER_NNFW_HOME}/scripts/command/gbs.conf build -A armv7l --profile=profile.tizen --clean --include-all --define '${GBS_DEFINE}' &&
+CMD="gbs -c ${NNFW_PROJECT_PATH}/scripts/command/gbs.conf build -A armv7l --profile=profile.tizen --clean --include-all --define '${GBS_DEFINE}' &&
          cp -rf /home/GBS-ROOT/local/repos/tizen/armv7l/RPMS/*.rpm ${DOCKER_RPM_HOME}/."
-docker run $DOCKER_RUN_OPTS $DOCKER_VOLUMES ${DOCKER_ENV_VARS:-} ${DOCKER_IMAGE} sh -c "$CMD"
-BUILD_RESULT=$?
+source run docker-run bash -c "${CMD}"
+EXITCODE=$?
 
-source $SCRIPT_ROOT/../docker_helper
-restore_ownership $HOST_HOME $DOCKER_NNFW_HOME
-restore_ownership $HOST_HOME $DOCKER_RPM_HOME
+popd
 
-exit $BUILD_RESULT
+exit $EXITCODE