aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sokolovsky <paul.sokolovsky@linaro.org>2014-11-14 22:47:08 +0200
committerPaul Sokolovsky <paul.sokolovsky@linaro.org>2014-11-14 23:02:56 +0200
commite1754e0f9ce2ef53d2ee67e47de7935d9be53f18 (patch)
tree31c9dafc42891e96e72a925e035dde3f0cc067f7
parentd301c61ca953adb7bd87c11ee30062ede0095973 (diff)
downloadlinaro-android-build-tools-e1754e0f9ce2ef53d2ee67e47de7935d9be53f18.tar.gz
setup-build-android: Disable ubuntu repos S3 workaround.
This used to make package fetching more robust, but now just breaks installation - apparently, indexes are stale. Change-Id: I878114b1ddf6a6d963cbc2c6946a49da0e3a19d8
-rwxr-xr-xnode/setup-build-android4
1 files changed, 3 insertions, 1 deletions
diff --git a/node/setup-build-android b/node/setup-build-android
index cb3ab49..1bfaf18 100755
--- a/node/setup-build-android
+++ b/node/setup-build-android
@@ -40,7 +40,9 @@ wget -nv --no-check-certificate 'http://android.git.linaro.org/gitweb?p=tools/re
mv repo /usr/local/bin/repo
chmod a+x /usr/local/bin/repo
-sed -i.bk 's,^\(.*://[^.]*.ec2.archive.ubuntu.com\)/,\1.s3.amazonaws.com/,' /etc/apt/sources.list
+# Disabled workaround for 14.04, as it causes problems with it
+#sed -i.bk 's,^\(.*://[^.]*.ec2.archive.ubuntu.com\)/,\1.s3.amazonaws.com/,' /etc/apt/sources.list
+
apt-get-retry --non-fatal update
# add feature to allow add-apt-repository