mirror of
https://github.com/flatcar/scripts.git
synced 2025-08-15 08:56:58 +02:00
Merge pull request #27 from marineam/buildhost
fix(coreos/config): Cleanup make.conf spaghetti, change target binhosts.
This commit is contained in:
commit
6a18625b15
@ -1 +0,0 @@
|
||||
LATEST_RELEASE_CHROME_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/amd64-corei7/chrome-1738.0.0-rc1/packages/"
|
@ -1 +0,0 @@
|
||||
PREFLIGHT_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/amd64-corei7/paladin-1742.0.0-rc8/packages/"
|
@ -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=""
|
||||
|
@ -1 +1 @@
|
||||
PREFLIGHT_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/amd64-generic/paladin-R26-3659.0.0-rc7/packages/"
|
||||
PREFLIGHT_BINHOST=""
|
||||
|
@ -1 +0,0 @@
|
||||
LATEST_RELEASE_CHROME_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/arm-generic/chrome-1415.0.0-rc1/packages/"
|
@ -1 +0,0 @@
|
||||
PREFLIGHT_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/arm-generic/binary-1415.0.0-rc7/packages/"
|
@ -1,3 +0,0 @@
|
||||
# Deprecated. TODO(davidjames): Remove this file once everybody has run
|
||||
# build_packages.
|
||||
PORTAGE_BINHOST="$PORTAGE_BINHOST $FULL_BINHOST"
|
@ -1 +0,0 @@
|
||||
LATEST_RELEASE_CHROME_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/daisy/chrome-R26-3659.0.0-rc1/packages/"
|
@ -1 +0,0 @@
|
||||
LATEST_RELEASE_CHROME_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/tegra2/chrome-R23-2768.0.0-rc2/packages/"
|
@ -1 +0,0 @@
|
||||
PREFLIGHT_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/tegra2/paladin-R23-2768.0.0-rc8/packages/"
|
@ -1 +0,0 @@
|
||||
LATEST_RELEASE_CHROME_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/x86-generic/chrome-R26-3659.0.0-rc1/packages/"
|
@ -1 +0,0 @@
|
||||
PREFLIGHT_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/x86-generic/paladin-R26-3659.0.0-rc7/packages/"
|
@ -1 +0,0 @@
|
||||
TOT_CHROME_BINHOST="http://commondatastorage.googleapis.com/chromeos-prebuilt/board/x86-generic/chrome-14.09.11.105729/packages/"
|
@ -1 +0,0 @@
|
||||
LATEST_RELEASE_CHROME_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/board/x86-generic_aura/chrome-1713.0.0-rc3/packages/"
|
@ -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"
|
@ -10,11 +10,14 @@ 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=""
|
||||
|
||||
# Allow a board to override or define additional settings.
|
||||
source make.conf.board
|
||||
CFLAGS="-O2 -pipe ${MARCH_TUNE} -g"
|
||||
CXXFLAGS="${CFLAGS}"
|
||||
|
||||
|
@ -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
|
@ -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
|
Loading…
Reference in New Issue
Block a user