From 3fde52aff9f398816eaf77b8cee494a7fc4c466a Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Wed, 6 Mar 2013 14:19:43 -0800 Subject: [PATCH] fix(coreos/config): use both osuosl and chromeos mirrors we need chromeos mirrors for stable packages and osuosl for new ones. In the future we will mirror our own stable packages. --- .../coreos-overlay/coreos/config/make.conf.amd64-host | 5 ++++- .../coreos-overlay/coreos/config/make.conf.common-target | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-host b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-host index 8d2a927284..d0b74f78ee 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-host +++ b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-host @@ -46,7 +46,10 @@ PORTAGE_BINHOST="$PREFLIGHT_BINHOST $FULL_BINHOST" # expat needed for XML parsing in GDB, but enable globally as overhead is tiny. USE="${USE} -cups hardened cros_host multilib pic pie -introspection expat" -GENTOO_MIRRORS="http://gentoo.osuosl.org/" +GENTOO_MIRRORS=" + http://gentoo.osuosl.org/ + https://commondatastorage.googleapis.com/chromeos-mirror/gentoo +" # Remove all .la files for non-plugin libraries. # Remove Gentoo init files since we use upstart. diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.common-target b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.common-target index 2f447794ad..31b40c8c3f 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.common-target +++ b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.common-target @@ -60,7 +60,10 @@ PORTAGE_BINPKG_TAR_OPTS="--checkpoint=1000" DISTDIR="/var/lib/portage/distfiles-target" # TODO: Our mirror should be more stable since we won't discard packages. -GENTOO_MIRRORS="http://gentoo.osuosl.org/" +GENTOO_MIRRORS=" + http://gentoo.osuosl.org/ + https://commondatastorage.googleapis.com/chromeos-mirror/gentoo +" # Username and home directory of the shared user. SHARED_USER_NAME="core"