mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-14 08:26:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(coreos/config): Cleanup make.conf spaghetti, change target binhosts.

Browse Source 
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.
This commit is contained in:
Michael Marineau 2013-06-22 15:47:55 -04:00
parent 55ec02e342
commit 3f7bcba442
18 changed files with 9 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/amd64-corei7-LATEST_RELEASE_CHROME_BINHOST.conf vendored
View File

@ -1 +0,0 @@
LATEST_RELEASE_CHROME_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/amd64-corei7/chrome-1738.0.0-rc1/packages/"

1
sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/amd64-corei7-PREFLIGHT_BINHOST.conf vendored
View File

@ -1 +0,0 @@
PREFLIGHT_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/amd64-corei7/paladin-1742.0.0-rc8/packages/"

2
sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/amd64-generic-LATEST_RELEASE_CHROME_BINHOST.conf vendored
View File

@ -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=""

2
sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/amd64-generic-PREFLIGHT_BINHOST.conf vendored
View File

@ -1 +1 @@
PREFLIGHT_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/amd64-generic/paladin-R26-3659.0.0-rc7/packages/" PREFLIGHT_BINHOST=""

1
sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/arm-generic-LATEST_RELEASE_CHROME_BINHOST.conf vendored
View File

@ -1 +0,0 @@
LATEST_RELEASE_CHROME_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/arm-generic/chrome-1415.0.0-rc1/packages/"

1
sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/arm-generic-PREFLIGHT_BINHOST.conf vendored
View File

@ -1 +0,0 @@
PREFLIGHT_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/arm-generic/binary-1415.0.0-rc7/packages/"

3
sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/arm.conf vendored
View File

@ -1,3 +0,0 @@
# Deprecated. TODO(davidjames): Remove this file once everybody has run
# build_packages.
PORTAGE_BINHOST="$PORTAGE_BINHOST $FULL_BINHOST"

1
sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/daisy-LATEST_RELEASE_CHROME_BINHOST.conf vendored
View File

@ -1 +0,0 @@
LATEST_RELEASE_CHROME_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/daisy/chrome-R26-3659.0.0-rc1/packages/"

1
sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/tegra2-LATEST_RELEASE_CHROME_BINHOST.conf vendored
View File

@ -1 +0,0 @@
LATEST_RELEASE_CHROME_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/tegra2/chrome-R23-2768.0.0-rc2/packages/"

1
sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/tegra2-PREFLIGHT_BINHOST.conf vendored
View File

@ -1 +0,0 @@
PREFLIGHT_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/tegra2/paladin-R23-2768.0.0-rc8/packages/"

1
sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/x86-generic-LATEST_RELEASE_CHROME_BINHOST.conf vendored
View File

@ -1 +0,0 @@
LATEST_RELEASE_CHROME_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/x86-generic/chrome-R26-3659.0.0-rc1/packages/"

1
sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/x86-generic-PREFLIGHT_BINHOST.conf vendored
View File

@ -1 +0,0 @@
PREFLIGHT_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/x86-generic/paladin-R26-3659.0.0-rc7/packages/"

1
sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/x86-generic-TOT_CHROME_BINHOST.conf vendored
View File

@ -1 +0,0 @@
TOT_CHROME_BINHOST="http://commondatastorage.googleapis.com/chromeos-prebuilt/board/x86-generic/chrome-14.09.11.105729/packages/"

1
sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/x86-generic_aura-LATEST_RELEASE_CHROME_BINHOST.conf vendored
View File

@ -1 +0,0 @@
LATEST_RELEASE_CHROME_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/x86-generic_aura/chrome-1713.0.0-rc3/packages/"

6
sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/x86.conf vendored
View File

@ -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"

9
sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-target vendored
View File

@ -10,11 +10,16 @@ ACCEPT_KEYWORDS="amd64"
# Common settings across all board targets. # Common settings across all board targets.
source make.conf.common source make.conf.common
PORTAGE_BINHOST="
http://storage.core-os.net/coreos/amd64-generic/experimental/20130622/pkgs
"
# Recommended MARCH_TUNE, CFLAGS, etc. # 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. # Allow a board to override or define additional settings.
source make.conf.board
CFLAGS="-O2 -pipe ${MARCH_TUNE} -g" CFLAGS="-O2 -pipe ${MARCH_TUNE} -g"
CXXFLAGS="${CFLAGS}" CXXFLAGS="${CFLAGS}"

26
sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.arm-target vendored
View File

@ -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

29
sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.x86-target vendored
View File

@ -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