diff options
author | Vishal Bhoj <vishal.bhoj@linaro.org> | 2015-10-22 21:36:09 +0530 |
---|---|---|
committer | Vishal Bhoj <vishal.bhoj@linaro.org> | 2015-10-22 21:43:32 +0530 |
commit | 9bcbefd8e89a09c2bb951b5af598f08b723a423b (patch) | |
tree | a975ebc4e5e739d089ad2d35525ec05a75ab7a85 | |
parent | 3a5d87a6744b859a8601b188d70f0693e3bad823 (diff) |
Fix gerrit issuetemp-fix
Change-Id: I6c0fa61001255f64f9eaaf4d305e2cdc01da7c87
Signed-off-by: Vishal Bhoj <vishal.bhoj@linaro.org>
-rw-r--r-- | build-scripts/build-android | 4 | ||||
-rw-r--r--[l---------] | build-scripts/build-android-private | 12 | ||||
-rwxr-xr-x | build-scripts/create-user-build-script | 2 | ||||
-rw-r--r-- | build-scripts/helpers | 6 | ||||
-rwxr-xr-x | build-scripts/rewrite-manifest.py | 10 | ||||
-rwxr-xr-x | node/build | 4 |
6 files changed, 24 insertions, 14 deletions
diff --git a/build-scripts/build-android b/build-scripts/build-android index a0c17a7..6a534a2 100644 --- a/build-scripts/build-android +++ b/build-scripts/build-android @@ -70,11 +70,11 @@ else if [ -n "$GERRIT_PROJECT" ] && [ $GERRIT_EVENT_TYPE == "patchset-created" ]; then if [ "$GERRIT_PROJECT" == "platform/manifest" ]; then cd .repo/local_manifests; - git pull http://review.android.git.linaro.org/platform/manifest $GERRIT_REFSPEC + git pull http://review.android-git.linaro.org/platform/manifest $GERRIT_REFSPEC cd - else cd `grep -rni $GERRIT_PROJECT\" .repo/local_manifests | grep -Po 'path="\K[^"]*'` - git pull http://review.android.git.linaro.org/$GERRIT_PROJECT $GERRIT_REFSPEC + git pull http://review.android-git.linaro.org/$GERRIT_PROJECT $GERRIT_REFSPEC cd - fi fi diff --git a/build-scripts/build-android-private b/build-scripts/build-android-private index e68e597..7ba909f 120000..100644 --- a/build-scripts/build-android-private +++ b/build-scripts/build-android-private @@ -1 +1,11 @@ -build-android-restricted
\ No newline at end of file +############################################################################### +# Copyright (c) 2012 Linaro +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +############################################################################### + +set +x +export GIT_SSH=/usr/local/bin/ssh-linaro +exec bash -xe ${BUILD_SCRIPT_ROOT}/build-android "$@" diff --git a/build-scripts/create-user-build-script b/build-scripts/create-user-build-script index 4e45bc0..c4e1780 100755 --- a/build-scripts/create-user-build-script +++ b/build-scripts/create-user-build-script @@ -264,7 +264,7 @@ sync_commands() fi cat <<EOF # download the repo tool for android -curl "https://android.git.linaro.org/gitweb?p=tools/repo.git;a=blob_plain;f=repo;hb=refs/heads/stable" > repo +curl "https://android-git.linaro.org/gitweb?p=tools/repo.git;a=blob_plain;f=repo;hb=refs/heads/stable" > repo chmod +x repo # download the android code diff --git a/build-scripts/helpers b/build-scripts/helpers index 27e4662..8735aff 100644 --- a/build-scripts/helpers +++ b/build-scripts/helpers @@ -1,10 +1,10 @@ # Set REPO_MIRROR to non-empty value to get around upstream downtimes -#REPO_MIRROR="--repo-url=http://android.git.linaro.org/git-ro/tools/repo" -REPO_MIRROR="--repo-url=git://android.git.linaro.org/tools/repo" +#REPO_MIRROR="--repo-url=http://android-git.linaro.org/git-ro/tools/repo" +REPO_MIRROR="--repo-url=git://android-git.linaro.org/tools/repo" setup-repo-vars () { EABI="${EABI-arm-eabi}" - MANIFEST_REPO="${MANIFEST_REPO-git://android.git.kernel.org/platform/manifest.git}" + MANIFEST_REPO="${MANIFEST_REPO-git://android-git.linaro.org/platform/manifest.git}" MANIFEST_BRANCH="${MANIFEST_BRANCH-master}" MANIFEST_FILENAME="${MANIFEST_FILENAME-default.xml}" REPO_GROUPS=${REPO_GROUPS-"all,-notdefault,-eclipse"} diff --git a/build-scripts/rewrite-manifest.py b/build-scripts/rewrite-manifest.py index 352e207..b20f10d 100755 --- a/build-scripts/rewrite-manifest.py +++ b/build-scripts/rewrite-manifest.py @@ -13,12 +13,12 @@ from xml.etree.cElementTree import ( rewrite_urls = { # 'git://git.linaro.org': 'http://git.linaro.org/git-ro', # 'git://git.linaro.org/': 'http://git.linaro.org/git-ro/', -# 'git://android.git.linaro.org': 'http://android.git.linaro.org/git-ro', -# 'git://android.git.linaro.org/': 'http://android.git.linaro.org/git-ro/', +# 'git://android-git.linaro.org': 'http://android-git.linaro.org/git-ro', +# 'git://android-git.linaro.org/': 'http://android-git.linaro.org/git-ro/', 'git://git.linaro.org': 'http://git.linaro.org/git', 'git://git.linaro.org/': 'http://git.linaro.org/git/', - 'git://android.git.linaro.org': 'http://android.git.linaro.org/git', - 'git://android.git.linaro.org/': 'http://android.git.linaro.org/git/', + 'git://android-git.linaro.org': 'http://android-git.linaro.org/git', + 'git://android-git.linaro.org/': 'http://android-git.linaro.org/git/', } def fatal(msg): @@ -27,7 +27,7 @@ def fatal(msg): def rewrite_git_urls(root, options): - """Rewrites all android.git.linaro.org and git.linaro.org URLs. + """Rewrites all android-git.linaro.org and git.linaro.org URLs. Makes them use /git-ro and appends '.git' to repo names if they do not already have it. @@ -15,7 +15,7 @@ BUILD_SCRIPT_ROOT=$(readlink -f "$(dirname "${0}")/../build-scripts") source "${BUILD_SCRIPT_ROOT}"/helpers -REPO_TOOL_URL="https://android.git.linaro.org/gitweb?p=tools/repo.git;a=blob_plain;f=repo;hb=refs/heads/stable" +REPO_TOOL_URL="https://android-git.linaro.org/gitweb?p=tools/repo.git;a=blob_plain;f=repo;hb=refs/heads/stable" # Dump system release to build log echo @@ -85,7 +85,7 @@ if [ -n "$GERRIT_PROJECT" ] && [ $GERRIT_EVENT_TYPE == "patchset-created" ] ; th rm -rf /tmp/buildconf.$$ mkdir -p /tmp/buildconf.$$ cd /tmp/buildconf.$$ - git clone https://android.git.linaro.org/git/android-build-configs.git + git clone https://android-git.linaro.org/git/android-build-configs.git cd * git checkout master build_config=$(map_build_config) |