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

Merge pull request #48 from marineam/updates

Browse Source 
Updates and cleanups, use new release for binary packges
This commit is contained in:
Michael Marineau 2013-07-03 13:56:15 -07:00
commit 01ca116975
6 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/sdk_version.conf vendored
View File

@ -1,3 +1,3 @@
SDK_LATEST_VERSION="20130621235834" SDK_LATEST_VERSION="0001.1.0"
BOOTSTRAP_LATEST_VERSION="20130621235834" BOOTSTRAP_LATEST_VERSION="0001.1.0"
TC_PATH="2013/03/%(target)s-2013.03.07.000000.tar.xz" TC_PATH="2013/03/%(target)s-2013.03.07.000000.tar.xz"

14
sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-host vendored
View File

@ -1,9 +1,9 @@
# See "man make.conf" for the available options. # See "man make.conf" for the available options.
ACCEPT_KEYWORDS="amd64" # Get the current SDK version, useful for fetching the latest packages
CHOST="x86_64-pc-linux-gnu" source "/mnt/host/source/.repo/manifests/version.txt"
CFLAGS="-O2 -pipe" COREOS_VERSION_STRING="${COREOS_BUILD}.${COREOS_BRANCH}.${COREOS_PATCH}"
LDFLAGS="-Wl,-O2 -Wl,--as-needed"
FEATURES="allow-missing-manifests buildpkg clean-logs -collision-protect FEATURES="allow-missing-manifests buildpkg clean-logs -collision-protect
-ebuild-locks parallel-install sandbox -strict userfetch userpriv -ebuild-locks parallel-install sandbox -strict userfetch userpriv
usersandbox -unknown-features-warn" usersandbox -unknown-features-warn"
@ -11,10 +11,6 @@ FEATURES="allow-missing-manifests buildpkg clean-logs -collision-protect
# Since our portage comes from version control, we redirect distfiles # Since our portage comes from version control, we redirect distfiles
DISTDIR="/var/lib/portage/distfiles" DISTDIR="/var/lib/portage/distfiles"
# Don't fool around with python3, might get bit
USE_PYTHON="2.6"
PORTDIR="/usr/local/portage/stable" PORTDIR="/usr/local/portage/stable"
# We initialize PORTDIR_OVERLAY here to clobber any redefinitions elsewhere. # We initialize PORTDIR_OVERLAY here to clobber any redefinitions elsewhere.
@ -44,7 +40,7 @@ PORT_LOGDIR="/var/log/portage"
# rebuilt it yet. 20130621235834 contains everything built by bootstrap_sdk # rebuilt it yet. 20130621235834 contains everything built by bootstrap_sdk
PORTAGE_BINHOST=" PORTAGE_BINHOST="
http://storage.core-os.net/coreos/sdk/experimental/legacy/pkgs/ http://storage.core-os.net/coreos/sdk/experimental/legacy/pkgs/
http://storage.core-os.net/coreos/sdk/experimental/20130621235834/pkgs/ http://storage.core-os.net/coreos/sdk/${ARCH}/${COREOS_VERSION_STRING}/pkgs/
" "
GENTOO_MIRRORS=" GENTOO_MIRRORS="

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

@ -5,8 +5,6 @@
# Pull in definition of at least { ROOT, CHOST, [BOARD_OVERLAY] } # Pull in definition of at least { ROOT, CHOST, [BOARD_OVERLAY] }
source make.conf.board_setup source make.conf.board_setup
ACCEPT_KEYWORDS="amd64"
# Common settings across all board targets. # Common settings across all board targets.
source make.conf.common source make.conf.common

5
sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.common-target vendored
View File

@ -10,10 +10,6 @@
CBUILD=x86_64-pc-linux-gnu CBUILD=x86_64-pc-linux-gnu
HOSTCC=x86_64-pc-linux-gnu-gcc HOSTCC=x86_64-pc-linux-gnu-gcc
LDFLAGS="-Wl,-O2 -Wl,--as-needed"
ACCEPT_KEYWORDS="${ARCH}"
# Be sure we don't overwrite pkgs from another sysroot. # Be sure we don't overwrite pkgs from another sysroot.
PKGDIR=${ROOT}packages/ PKGDIR=${ROOT}packages/
PORTAGE_TMPDIR=${ROOT}tmp/ PORTAGE_TMPDIR=${ROOT}tmp/
@ -27,7 +23,6 @@ FEATURES="allow-missing-manifests buildpkg clean-logs -collision-protect
PORTAGE_WORKDIR_MODE="0755" PORTAGE_WORKDIR_MODE="0755"
PKG_CONFIG_PATH="${ROOT}usr/lib/pkgconfig/:${ROOT}usr/share/pkgconfig/" PKG_CONFIG_PATH="${ROOT}usr/lib/pkgconfig/:${ROOT}usr/share/pkgconfig/"
ELIBC="glibc"
PORTDIR="/usr/local/portage/stable" PORTDIR="/usr/local/portage/stable"

2
sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults vendored
View File

@ -127,6 +127,8 @@ BOOTSTRAP_USE="cxx unicode threads curl"
# Default target(s) for python-r1.eclass # Default target(s) for python-r1.eclass
PYTHON_TARGETS="python2_6" PYTHON_TARGETS="python2_6"
PYTHON_SINGLE_TARGET="python2_6" PYTHON_SINGLE_TARGET="python2_6"
# TODO(marineam): remove USE_PYTHON during the 2.7 upgrade
USE_PYTHON="2.6"
# ChromeOS-specific: BOARD_USE for accessing board value in cros-board.eclass # ChromeOS-specific: BOARD_USE for accessing board value in cros-board.eclass
# CROS_WORKON_TREE for cros-workon # CROS_WORKON_TREE for cros-workon

2
sdk_container/src/third_party/coreos-overlay/profiles/default/linux/make.defaults vendored
View File

@ -42,7 +42,7 @@ VIDEO_CARDS="dummy fbdev v4l"
# after discussion on the gentoo-dev ML. As we bang out a clear # after discussion on the gentoo-dev ML. As we bang out a clear
# direction with how LDFLAGS will be set by default, this entry # direction with how LDFLAGS will be set by default, this entry
# may move. # may move.
LDFLAGS="-Wl,-O1" LDFLAGS="-Wl,-O1 -Wl,--as-needed"
# 2009/09/21 Robin H. Johnson <robbat2@gentoo.org> # 2009/09/21 Robin H. Johnson <robbat2@gentoo.org>
# http://archives.gentoo.org/gentoo-dev/msg_dc705dc2c1a45e18a85aa62e8fb17009.xml # http://archives.gentoo.org/gentoo-dev/msg_dc705dc2c1a45e18a85aa62e8fb17009.xml