linaro-build.sh: drop the default REPO_URL

and the --no-repo-verify option for repo init command
so that the default repo repository would be used
if not specified

Change-Id: Ic70619a82dd10e576a0d69c2ace242064f964f3f
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>

1 files changed, 10 insertions, 6 deletions

diff --git a/linaro-build.sh b/linaro-build.sh
index 49c3e728..1e7fc4ac 100755
--- a/linaro-build.sh
+++ b/linaro-build.sh
@@ -41,7 +41,7 @@ export JAVA_HOME=/usr/lib/jvm/java-8-openjdk-amd64/
 export PATH=${JAVA_HOME}/bin:$PATH
 
 ########### contants #####################
-REPO_URL="git://android.git.linaro.org/tools/repo"
+REPO_URL=""
 BASE_MANIFEST="default.xml"
 default_build_config_url_prefix="https://android-git.linaro.org/android-build-configs.git/plain"
 
@@ -113,13 +113,17 @@ function repo_sync_patch(){
         else
             url_manifest="${DEFAULT_MANIFEST_URL}"
         fi
+        if [ -n "${REPO_URL}" ]; then
+            opt_repo_url="--repo-url=${REPO_URL}"
+        else
+            opt_repo_url=""
+        fi
         while ! repo init \
             -u "${url_manifest}" \
             -m "${BASE_MANIFEST}" \
             -g "${opt_group}" \
-            -b "${MANIFEST_BRANCH:-${DEFAULT_MANIFEST_BRANCH}}" \
-            --repo-url=${REPO_URL} \
-            --no-repo-verify; do
+            ${opt_repo_url} \
+            -b "${MANIFEST_BRANCH:-${DEFAULT_MANIFEST_BRANCH}}"; do
             sleep 30
         done
     fi
@@ -130,9 +134,9 @@ function repo_sync_patch(){
             # remove local_manifests when LOCAL_MANIFEST not specified
             ${skip_init} || rm -fr .repo/local_manifests
         elif [ -d .repo/local_manifests ]; then
-            pushd .repo/local_manifests
+            cd .repo/local_manifests
             git pull
-            popd
+            cd -
         else
             git clone "${LOCAL_MANIFEST}" -b "${LOCAL_MANIFEST_BRANCH}" .repo/local_manifests
         fi