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

fix(config): Move USE_PYTHON into profiles.

Browse Source 
Unlikely this is actually needed right now but it isn't hurting either.
Will remove it once we move to Python 2.7.
This commit is contained in:
Michael Marineau 2013-07-03 15:33:19 -04:00
parent 7018c2d527
commit a09f4ee92f
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,10 +7,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.

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