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

profiles: Update Python 3 to 3.6

Browse Source
This commit is contained in:
David Michael 2018-06-12 13:36:54 +00:00
parent edfb3ce2be
commit 03db32ae98
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,12 +14,12 @@ USE_EXPAND="${USE_EXPAND} GO_VERSION"
USE="${USE} cros_host expat -cracklib -introspection -cups -tcpd -berkdb" USE="${USE} cros_host expat -cracklib -introspection -cups -tcpd -berkdb"
# Continue using Python 2 as the default version, but build Python 3 support. # Continue using Python 2 as the default version, but build Python 3 support.
USE="${USE} python_single_target_python2_7 -python_single_target_python3_4" USE="${USE} python_single_target_python2_7 -python_single_target_python3_5 -python_single_target_python3_6"
USE="${USE} python_targets_python2_7 python_targets_python3_4" USE="${USE} python_targets_python2_7 -python_targets_python3_5 python_targets_python3_6"
# Disable Python 3 while building the SDK until we transition off Python 2. # Disable Python 3 while building the SDK until we transition off Python 2.
BOOTSTRAP_USE="${BOOTSTRAP_USE} python_single_target_python2_7 -python_single_target_python3_4" BOOTSTRAP_USE="${BOOTSTRAP_USE} python_single_target_python2_7 -python_single_target_python3_5 -python_single_target_python3_6"
BOOTSTRAP_USE="${BOOTSTRAP_USE} python_targets_python2_7 -python_targets_python3_4" BOOTSTRAP_USE="${BOOTSTRAP_USE} python_targets_python2_7 -python_targets_python3_5 -python_targets_python3_6"
# Never install cron or cron jobs # Never install cron or cron jobs
USE="${USE} -cron" USE="${USE} -cron"

3
sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask vendored
View File

@ -14,6 +14,3 @@
# mask an accidental rkt major version bump to ensure it's not chosen over more # mask an accidental rkt major version bump to ensure it's not chosen over more
# recent releases # recent releases
=app-emulation/rkt-13.0 =app-emulation/rkt-13.0
# Temporarily block newer stable Python versions until profiles are updated.
>=dev-lang/python-3.5

10
sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use vendored
View File

@ -19,11 +19,11 @@ sys-devel/gettext -git
app-emulation/qemu aio caps curl jpeg ncurses png python threads uuid vhost-net virtfs vnc qemu_softmmu_targets_x86_64 app-emulation/qemu aio caps curl jpeg ncurses png python threads uuid vhost-net virtfs vnc qemu_softmmu_targets_x86_64
# python3 problems # python3 problems
app-portage/gentoolkit -python_targets_python3_4 app-portage/gentoolkit -python_targets_python3_6
app-portage/gentoolkit-dev -python_targets_python3_4 app-portage/gentoolkit-dev -python_targets_python3_6
app-portage/repoman -python_targets_python3_4 app-portage/repoman -python_targets_python3_6
dev-python/uritemplate -python_targets_python3_4 dev-python/uritemplate -python_targets_python3_6
sys-apps/portage -python_targets_python3_4 sys-apps/portage -python_targets_python3_6
sys-apps/gptfdisk -icu sys-apps/gptfdisk -icu