From 39843ab8be4b8385cbb18b1578fe9ce9fd353a6d Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 9 Jul 2013 10:38:30 -0700 Subject: [PATCH] fix(profiles): Move the mirror list from make.conf to profiles. Another piece of migrating as much as possible into our profiles, this should fix a current error blocking bootstrap_sdk builds. --- .../coreos-overlay/coreos/config/make.conf.amd64-host | 6 ------ .../coreos-overlay/coreos/config/make.conf.common-target | 6 ------ .../third_party/coreos-overlay/profiles/base/make.defaults | 7 +++++++ 3 files changed, 7 insertions(+), 12 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 19bdc50aa7..5a42b6e1c2 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 @@ -44,12 +44,6 @@ PORTAGE_BINHOST=" http://storage.core-os.net/coreos/sdk/${ARCH}/${COREOS_VERSION_STRING}/pkgs/ " -GENTOO_MIRRORS=" - http://storage.core-os.net/mirror/portage-stable/ - http://storage.core-os.net/mirror/coreos/ - http://distfiles.gentoo.org/ -" - # Remove all .la files for non-plugin libraries. # Remove Gentoo init files since we use upstart. # Remove logrotate.d files since we don't use logrotate. 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 1a8ddeacd0..f846f7f06b 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 @@ -53,12 +53,6 @@ PORTAGE_BINPKG_TAR_OPTS="--checkpoint=1000" # Since our portage comes from version control, we redirect distfiles. DISTDIR="/var/lib/portage/distfiles-target" -GENTOO_MIRRORS=" - http://storage.core-os.net/mirror/portage-stable/ - http://storage.core-os.net/mirror/coreos/ - http://distfiles.gentoo.org/ -" - # Username and home directory of the shared user. SHARED_USER_NAME="core" SHARED_USER_HOME="/home/core/user" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults index cac1c05562..83cfb0b460 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults @@ -149,3 +149,10 @@ USE="${USE} bindist" # If you want to accept more, use the --accept_licenses flag # when running setup_board. ACCEPT_LICENSE="* -@EULA -@CHROMEOS" + +# Favor our own mirrors over Gentoo's +GENTOO_MIRRORS=" + http://storage.core-os.net/mirror/portage-stable/ + http://storage.core-os.net/mirror/coreos/ + http://distfiles.gentoo.org/ +"