install-deps.sh: only download mirrored package index

E: Failed to fetch http://mirror.cs.uchicago.edu/ubuntu-toolchain-r/dists/xenial/main/binary-i386/Packages  404  Not Found
E: Failed to fetch http://mirror.yandex.ru/mirrors/launchpad/ubuntu-toolchain-r/dists/xenial/main/i18n/Translation-en  404  Not Found [IP: 213.180.204.183 80]
E: Some index files failed to download. They have been ignored, or old ones used instead.

On Ubuntu amd64 installations, i386 is enabled as an additional
architecture by default. apt & co. expect repositories to provide all
configured architectures, which causes the error above.

Signed-off-by: Songbo Wang <wangsongbo@cloudin.cn>

diff --git a/install-deps.sh b/install-deps.sh
index 0e86a9114dc2b20d3214cd09116b77cb9cd49b46..670f1fd254616a721939bc461114ab33add9e29c 100755 (executable)
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -40,8 +40,8 @@ function ensure_decent_gcc_on_deb {
     if [ ! -f /usr/bin/g++-${new} ]; then
        $SUDO tee /etc/apt/sources.list.d/ubuntu-toolchain-r.list <<EOF
 deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu $dist main
-deb http://mirror.cs.uchicago.edu/ubuntu-toolchain-r $dist main
-deb http://mirror.yandex.ru/mirrors/launchpad/ubuntu-toolchain-r $dist main
+deb [arch=amd64] http://mirror.cs.uchicago.edu/ubuntu-toolchain-r $dist main
+deb [arch=amd64,i386] http://mirror.yandex.ru/mirrors/launchpad/ubuntu-toolchain-r $dist main
 EOF
        # import PPA's signing key into APT's keyring
        $SUDO apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 1E9377A2BA9EF27F