aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sokolovsky <paul.sokolovsky@linaro.org>2014-01-26 21:22:34 +0200
committerPaul Sokolovsky <paul.sokolovsky@linaro.org>2014-01-26 21:30:53 +0200
commit29bfe75ea3da3294d533b6cf6501d68494fcd70a (patch)
treec332ce5c59561d63748395bbba4efa4eb5816b9b
parente895fbf16a513233b237cb883401eeb461f4f545 (diff)
downloadl-a-b-VPS-29bfe75ea3da3294d533b6cf6501d68494fcd70a.tar.gz
Re-enable manifest rewriting, but try http://.../git/ .
Change-Id: I60d37d3af60c91220c74ef6e4c6694f93412ad17
-rw-r--r--build-scripts/helpers14
-rwxr-xr-xbuild-scripts/rewrite-manifest.py12
2 files changed, 14 insertions, 12 deletions
diff --git a/build-scripts/helpers b/build-scripts/helpers
index 9a762e4..2c67f98 100644
--- a/build-scripts/helpers
+++ b/build-scripts/helpers
@@ -41,10 +41,9 @@ repo-sync-from-mirror () {
mkdir -p out
cp .repo/manifest.xml out/source-manifest.xml
-# Disabled as a test - pfalcon 2014-01-25
-# echo Replace Linaro git URLs with lightweight http git URLs.
-# ${BUILD_SCRIPT_ROOT}/rewrite-manifest.py .repo/manifest.xml > processed-manifest.xml
-# cp processed-manifest.xml .repo/manifest.xml
+ echo Replace Linaro git URLs with lightweight http git URLs.
+ ${BUILD_SCRIPT_ROOT}/rewrite-manifest.py .repo/manifest.xml > processed-manifest.xml
+ cp processed-manifest.xml .repo/manifest.xml
echo ----------------------------
repo-sync-stubborn
@@ -75,10 +74,9 @@ repo-sync-from-seed () {
mkdir -p out
cp .repo/manifest.xml out/source-manifest.xml
-# Disabled as a test - pfalcon 2014-01-25
-# echo Replace Linaro git URLs with lightweight http git URLs.
-# ${BUILD_SCRIPT_ROOT}/rewrite-manifest.py .repo/manifest.xml > processed-manifest.xml
-# cp processed-manifest.xml .repo/manifest.xml
+ echo Replace Linaro git URLs with lightweight http git URLs.
+ ${BUILD_SCRIPT_ROOT}/rewrite-manifest.py .repo/manifest.xml > processed-manifest.xml
+ cp processed-manifest.xml .repo/manifest.xml
export TIMEFORMAT="TIME: Repo sync (using seed as reference): %lR"
repo-sync-stubborn
diff --git a/build-scripts/rewrite-manifest.py b/build-scripts/rewrite-manifest.py
index 948fed0..4bdf15a 100755
--- a/build-scripts/rewrite-manifest.py
+++ b/build-scripts/rewrite-manifest.py
@@ -7,10 +7,14 @@ from xml.etree.cElementTree import (
import sys
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://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://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/',
}
def rewrite_git_urls(root):