From 8ea698435d1a65956351d92ef8b4ca51dc731d73 Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Sun, 5 Jan 2014 16:36:17 -0800
Subject: [PATCH] fix(make.conf): Don't share binary packages between boards.

Although it'd be nice to re-use packages for experimental boards that
may only have a few differences from amd64-generic there is a bug in
some ebuilds and portage that break sharing binary packages between
different values of $ROOT. This prevents that from happening by
accident.

https://bugs.gentoo.org/show_bug.cgi?id=490014
---
 .../coreos-overlay/coreos/config/make.conf.amd64-target  | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-target b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-target
index eb533f6a6a..123bddf7eb 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-target
+++ b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-target
@@ -12,12 +12,11 @@ source make.conf.board_setup
 # Common settings across all board targets.
 source make.conf.common
 
-# TODO: set $BOARD in make.conf.board_setup and use it
 PORTAGE_BINHOST="
-    http://storage.core-os.net/coreos/amd64-generic/${COREOS_VERSION_STRING}/pkgs/
-    http://storage.core-os.net/coreos/amd64-generic/${COREOS_VERSION_STRING}/toolchain/
-    http://storage.core-os.net/coreos/amd64-generic/${COREOS_SDK_VERSION}/pkgs/
-    http://storage.core-os.net/coreos/amd64-generic/${COREOS_SDK_VERSION}/toolchain/
+    http://storage.core-os.net/coreos/${BOARD_USE}/${COREOS_VERSION_STRING}/pkgs/
+    http://storage.core-os.net/coreos/${BOARD_USE}/${COREOS_VERSION_STRING}/toolchain/
+    http://storage.core-os.net/coreos/${BOARD_USE}/${COREOS_SDK_VERSION}/pkgs/
+    http://storage.core-os.net/coreos/${BOARD_USE}/${COREOS_SDK_VERSION}/toolchain/
 "
 
 # Recommended MARCH_TUNE, CFLAGS, etc.