Handle keystore error issue

[scm/meta/abs.git] / build.template

diff --git a/build.template b/build.template
index ae4cac6..dd62134 100644 (file)
--- a/build.template
+++ b/build.template
@@ -65,17 +65,15 @@ TIDLC_PATH=`sed -n '/tidl/p' /home/build/.bashrc | cut -f2 -d':'`
 if [ ! -z ${TIDLC_PATH} ]; then echo "PATH=\$PATH:${TIDLC_PATH}" >> /home/build/.profile; fi
 su - build -c "tidlc --version"
 
-DBUS_SESSION="dbus-run-session -- bash && echo build | gnome-keyring-daemon --unlock && "
-su - build -c "gnome-keyring-daemon --help"
-if [ $? -ne 0 ]; then
-  DBUS_SESSION=" "
-fi
 for rs in $rs_list; do
   echo "BUILDING START TIME: `date`"
   #if [[ $rs == *"64.core"* ]]; then
   #  echo "SKIP! 64-bit not supported!"; continue;
   #else
-    su - build -c "${DBUS_SESSION} ${ABS_CMD} build -r $rs -w ${BUILD_ROOT}/${PACKAGE} -s ABS -c ${BUILD_MODE} ${PARALLEL_JOBS} --profile-to-search ${PROFILE}"
+
+  su - build -c "${ABS_CMD} build -r $rs -w ${BUILD_ROOT}/${PACKAGE} -s ABS -c ${BUILD_MODE} ${PARALLEL_JOBS} --profile-to-search ${PROFILE}"
+  build_result=$?
+  echo "BUILD RET: ${build_result}"
   #fi
   count=`ls -1 ${TMP_DIR}/*.tpk 2>/dev/null | wc -l`
   if [ $count != 0 ]; then
@@ -85,7 +83,7 @@ for rs in $rs_list; do
   fi
   ret=$?; echo "BUILDING FINISH TIME: `date`"
   if [ $ret != 0 ]; then
-    echo $rs build fail; _clear 8
+    echo $rs build fail; _clear $build_result
   fi
 done