From 3f7bcba442de2bcff6f678320e62dfb2f0d4eb9e Mon Sep 17 00:00:00 2001
From: Michael Marineau <michael.marineau@coreos.com>
Date: Sat, 22 Jun 2013 15:47:55 -0400
Subject: [PATCH] fix(coreos/config): Cleanup make.conf spaghetti, change
 target binhosts.

Replace ChromiumOS target binhosts with our own. The auto-generated
files have been stubbed out and configs for targets we don't currently
support have been removed. MARCH_TUNE is now defined here.

After this change target binhosts will defined here and
/etc/make.conf.board and overlay-amd64-generic/make.conf are no longer
used. The new setup_board only creates /etc/make.conf.board_setup.
---
 ...-corei7-LATEST_RELEASE_CHROME_BINHOST.conf |  1 -
 .../amd64-corei7-PREFLIGHT_BINHOST.conf       |  1 -
 ...generic-LATEST_RELEASE_CHROME_BINHOST.conf |  2 +-
 .../amd64-generic-PREFLIGHT_BINHOST.conf      |  2 +-
 ...generic-LATEST_RELEASE_CHROME_BINHOST.conf |  1 -
 .../target/arm-generic-PREFLIGHT_BINHOST.conf |  1 -
 .../coreos/binhost/target/arm.conf            |  3 --
 .../daisy-LATEST_RELEASE_CHROME_BINHOST.conf  |  1 -
 .../tegra2-LATEST_RELEASE_CHROME_BINHOST.conf |  1 -
 .../target/tegra2-PREFLIGHT_BINHOST.conf      |  1 -
 ...generic-LATEST_RELEASE_CHROME_BINHOST.conf |  1 -
 .../target/x86-generic-PREFLIGHT_BINHOST.conf |  1 -
 .../x86-generic-TOT_CHROME_BINHOST.conf       |  1 -
 ...ic_aura-LATEST_RELEASE_CHROME_BINHOST.conf |  1 -
 .../coreos/binhost/target/x86.conf            |  6 ----
 .../coreos/config/make.conf.amd64-target      |  9 ++++--
 .../coreos/config/make.conf.arm-target        | 26 -----------------
 .../coreos/config/make.conf.x86-target        | 29 -------------------
 18 files changed, 9 insertions(+), 79 deletions(-)
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/amd64-corei7-LATEST_RELEASE_CHROME_BINHOST.conf
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/amd64-corei7-PREFLIGHT_BINHOST.conf
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/arm-generic-LATEST_RELEASE_CHROME_BINHOST.conf
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/arm-generic-PREFLIGHT_BINHOST.conf
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/arm.conf
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/daisy-LATEST_RELEASE_CHROME_BINHOST.conf
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/tegra2-LATEST_RELEASE_CHROME_BINHOST.conf
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/tegra2-PREFLIGHT_BINHOST.conf
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/x86-generic-LATEST_RELEASE_CHROME_BINHOST.conf
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/x86-generic-PREFLIGHT_BINHOST.conf
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/x86-generic-TOT_CHROME_BINHOST.conf
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/x86-generic_aura-LATEST_RELEASE_CHROME_BINHOST.conf
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/x86.conf
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.arm-target
 delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.x86-target

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/amd64-corei7-LATEST_RELEASE_CHROME_BINHOST.conf b/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/amd64-corei7-LATEST_RELEASE_CHROME_BINHOST.conf
deleted file mode 100644
index 8d76bcd7b5..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/amd64-corei7-LATEST_RELEASE_CHROME_BINHOST.conf
+++ /dev/null
@@ -1 +0,0 @@
-LATEST_RELEASE_CHROME_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/amd64-corei7/chrome-1738.0.0-rc1/packages/"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/amd64-corei7-PREFLIGHT_BINHOST.conf b/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/amd64-corei7-PREFLIGHT_BINHOST.conf
deleted file mode 100644
index 1dc624f430..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/amd64-corei7-PREFLIGHT_BINHOST.conf
+++ /dev/null
@@ -1 +0,0 @@
-PREFLIGHT_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/amd64-corei7/paladin-1742.0.0-rc8/packages/"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/amd64-generic-LATEST_RELEASE_CHROME_BINHOST.conf b/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/amd64-generic-LATEST_RELEASE_CHROME_BINHOST.conf
index 8052a5645c..db55ee61b7 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/amd64-generic-LATEST_RELEASE_CHROME_BINHOST.conf
+++ b/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/amd64-generic-LATEST_RELEASE_CHROME_BINHOST.conf
@@ -1 +1 @@
-LATEST_RELEASE_CHROME_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/amd64-generic/chrome-R26-3659.0.0-rc1/packages/"
+LATEST_RELEASE_CHROME_BINHOST=""
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/amd64-generic-PREFLIGHT_BINHOST.conf b/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/amd64-generic-PREFLIGHT_BINHOST.conf
index 102b6f915a..b875cb5810 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/amd64-generic-PREFLIGHT_BINHOST.conf
+++ b/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/amd64-generic-PREFLIGHT_BINHOST.conf
@@ -1 +1 @@
-PREFLIGHT_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/amd64-generic/paladin-R26-3659.0.0-rc7/packages/"
+PREFLIGHT_BINHOST=""
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/arm-generic-LATEST_RELEASE_CHROME_BINHOST.conf b/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/arm-generic-LATEST_RELEASE_CHROME_BINHOST.conf
deleted file mode 100644
index 2baa44d596..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/arm-generic-LATEST_RELEASE_CHROME_BINHOST.conf
+++ /dev/null
@@ -1 +0,0 @@
-LATEST_RELEASE_CHROME_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/arm-generic/chrome-1415.0.0-rc1/packages/"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/arm-generic-PREFLIGHT_BINHOST.conf b/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/arm-generic-PREFLIGHT_BINHOST.conf
deleted file mode 100644
index efacf05304..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/arm-generic-PREFLIGHT_BINHOST.conf
+++ /dev/null
@@ -1 +0,0 @@
-PREFLIGHT_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/arm-generic/binary-1415.0.0-rc7/packages/"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/arm.conf b/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/arm.conf
deleted file mode 100644
index 0fe0aee273..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/arm.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# Deprecated. TODO(davidjames): Remove this file once everybody has run
-# build_packages.
-PORTAGE_BINHOST="$PORTAGE_BINHOST $FULL_BINHOST"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/daisy-LATEST_RELEASE_CHROME_BINHOST.conf b/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/daisy-LATEST_RELEASE_CHROME_BINHOST.conf
deleted file mode 100644
index 7310a20c7c..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/daisy-LATEST_RELEASE_CHROME_BINHOST.conf
+++ /dev/null
@@ -1 +0,0 @@
-LATEST_RELEASE_CHROME_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/daisy/chrome-R26-3659.0.0-rc1/packages/"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/tegra2-LATEST_RELEASE_CHROME_BINHOST.conf b/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/tegra2-LATEST_RELEASE_CHROME_BINHOST.conf
deleted file mode 100644
index 1daf254955..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/tegra2-LATEST_RELEASE_CHROME_BINHOST.conf
+++ /dev/null
@@ -1 +0,0 @@
-LATEST_RELEASE_CHROME_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/tegra2/chrome-R23-2768.0.0-rc2/packages/"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/tegra2-PREFLIGHT_BINHOST.conf b/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/tegra2-PREFLIGHT_BINHOST.conf
deleted file mode 100644
index 2dc36b6dc7..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/tegra2-PREFLIGHT_BINHOST.conf
+++ /dev/null
@@ -1 +0,0 @@
-PREFLIGHT_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/tegra2/paladin-R23-2768.0.0-rc8/packages/"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/x86-generic-LATEST_RELEASE_CHROME_BINHOST.conf b/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/x86-generic-LATEST_RELEASE_CHROME_BINHOST.conf
deleted file mode 100644
index c2fab2fe43..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/x86-generic-LATEST_RELEASE_CHROME_BINHOST.conf
+++ /dev/null
@@ -1 +0,0 @@
-LATEST_RELEASE_CHROME_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/x86-generic/chrome-R26-3659.0.0-rc1/packages/"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/x86-generic-PREFLIGHT_BINHOST.conf b/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/x86-generic-PREFLIGHT_BINHOST.conf
deleted file mode 100644
index a8f3af4377..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/x86-generic-PREFLIGHT_BINHOST.conf
+++ /dev/null
@@ -1 +0,0 @@
-PREFLIGHT_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/x86-generic/paladin-R26-3659.0.0-rc7/packages/"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/x86-generic-TOT_CHROME_BINHOST.conf b/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/x86-generic-TOT_CHROME_BINHOST.conf
deleted file mode 100644
index 563d041f49..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/x86-generic-TOT_CHROME_BINHOST.conf
+++ /dev/null
@@ -1 +0,0 @@
-TOT_CHROME_BINHOST="http://commondatastorage.googleapis.com/chromeos-prebuilt/board/x86-generic/chrome-14.09.11.105729/packages/"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/x86-generic_aura-LATEST_RELEASE_CHROME_BINHOST.conf b/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/x86-generic_aura-LATEST_RELEASE_CHROME_BINHOST.conf
deleted file mode 100644
index cbdf29574a..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/x86-generic_aura-LATEST_RELEASE_CHROME_BINHOST.conf
+++ /dev/null
@@ -1 +0,0 @@
-LATEST_RELEASE_CHROME_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/x86-generic_aura/chrome-1713.0.0-rc3/packages/"
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/x86.conf b/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/x86.conf
deleted file mode 100644
index 0a397acabb..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/x86.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Deprecated. TODO(davidjames): Remove this file once everybody has run
-# build_packages.
-source x86-generic-LATEST_RELEASE_CHROME_BINHOST.conf
-source x86-generic-PREFLIGHT_BINHOST.conf
-PORTAGE_BINHOST="$PORTAGE_BINHOST $PREFLIGHT_BINHOST $FULL_BINHOST"
-PORTAGE_BINHOST="$PORTAGE_BINHOST $LATEST_RELEASE_CHROME_BINHOST"
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 75eb28c028..dbed29e041 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
@@ -10,11 +10,16 @@ ACCEPT_KEYWORDS="amd64"
 # Common settings across all board targets.
 source make.conf.common
 
+PORTAGE_BINHOST="
+    http://storage.core-os.net/coreos/amd64-generic/experimental/20130622/pkgs
+"
+
 # Recommended MARCH_TUNE, CFLAGS, etc.
-MARCH_TUNE=""
+# We assume that our 64bit baseline CPU supports at least
+# MMX, SSE, SSE2, and SSE3.
+MARCH_TUNE="-march=x86-64 -msse3"
 
 # Allow a board to override or define additional settings.
-source make.conf.board
 CFLAGS="-O2 -pipe ${MARCH_TUNE} -g"
 CXXFLAGS="${CFLAGS}"
 
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.arm-target b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.arm-target
deleted file mode 100644
index c4a7503381..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.arm-target
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# Pull in definition of at least { ROOT, CHOST, [BOARD_OVERLAY] }
-source make.conf.board_setup
-
-E_MACHINE=EM_ARM
-ARCH=arm
-
-# Common settings across all board targets.
-source make.conf.common
-
-# Recommended arm-specific USE flags.
-USE="${USE} hardened"
-
-# Recommended MARCH_TUNE, CFLAGS, etc.
-MARCH_TUNE=""
-
-# Allow a board to override or define additional settings.
-source make.conf.board
-CFLAGS="-O2 -pipe ${MARCH_TUNE} -g"
-CXXFLAGS="${CFLAGS}"
-
-# Allow the user to override or define additional settings.
-source make.conf.user
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.x86-target b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.x86-target
deleted file mode 100644
index 16f0c0e187..0000000000
--- a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.x86-target
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-# Pull in definition of at least { ROOT, CHOST, [BOARD_OVERLAY] }
-source make.conf.board_setup
-
-# E_MACHINE=EM_X86 <- TODO: Some builds use EM_386 so comment this for now.
-ARCH=x86
-
-# Common settings across all board targets.
-source make.conf.common
-
-# Recommended x86-specific USE flags.
-USE="${USE} mmx sse sse2 dri hardened"
-
-# Recommended MARCH_TUNE, CFLAGS, etc.
-MARCH_TUNE="-march=atom -mtune=atom -mfpmath=sse"
-
-VIDEO_CARDS="intel vesa"
-INPUT_DEVICES="evdev synaptics cmt"
-
-# Allow a board to override or define additional settings.
-source make.conf.board
-CFLAGS="-O2 -pipe ${MARCH_TUNE} -g"
-CXXFLAGS="${CFLAGS}"
-
-# Allow the user to override or define additional settings.
-source make.conf.user