From 39940dad6fb7e235a82f0423a9bb14142f3bc327 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 28 Dec 2016 15:00:31 -0800 Subject: [PATCH] profiles: hard mask python3 use flags, add 3.5 to the list This seems less clunky than editing $BOOTSTRAP_USE. 3.2 is no longer in portage while 3.5 is coming so update the versions. --- .../coreos-overlay/profiles/coreos/base/make.defaults | 7 ------- .../coreos-overlay/profiles/coreos/base/use.mask | 9 +++++++++ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults index 36dbf9e60d..aaf58deb7b 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults @@ -39,13 +39,6 @@ USE="${USE} seccomp" # Set SELinux policy POLICY_TYPES="targeted mcs mls" -# Override upstream's python settings -USE="$USE python_targets_python2_7 python_single_target_python2_7" -USE="$USE -python_targets_python3_2 -python_single_target_python3_2" -USE="$USE -python_targets_python3_3 -python_single_target_python3_3" -BOOTSTRAP_USE="$BOOTSTRAP_USE -python_targets_python3_2" -BOOTSTRAP_USE="$BOOTSTRAP_USE -python_targets_python3_3" - # Disable packages or optional features with distribution issues. ACCEPT_RESTRICT="* -bindist -mirror" USE="${USE} bindist" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/use.mask index d7d483989a..bed2a39fb4 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/use.mask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/use.mask @@ -1 +1,10 @@ +# Never enable experimental code kdbus + +# Block python3 for now +python_targets_python3_3 +python_targets_python3_4 +python_targets_python3_5 +python_single_target_python3_3 +python_single_target_python3_4 +python_single_target_python3_5