Skip to content

Commit d4e33f7

Browse files
committed
overlay profiles: Ease into Python bump with transitional profile
We only allow one version of Python in the SDK and generic images, but this creates a friction during the SDK build where the seed still has an old version of Python and the stage1 is supposed to have the new one, and thus we end up with slot conflicts for python packages - I don't really understand what is going on (there are python packages in the seed image that are built for old Python and emerge wants to install the same packages in the seed but built for the new Python and it can't work its way around it.) Allowing both versions of Python to coexist in stage1 seems to be moving things forward. Stage3 image (stage2 is skipped) will contain only the new version of Python. Signed-off-by: Krzesimir Nowak <knowak@microsoft.com>
1 parent 965d344 commit d4e33f7

File tree

6 files changed

+14
-16
lines changed

6 files changed

+14
-16
lines changed

sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ USE_EXPAND="${USE_EXPAND} GO_VERSION"
1010

1111
USE="${USE} -cracklib -cups -tcpd -berkdb"
1212

13-
# Use Python 3.12 as the default version, allow python 3.11 for a transition.
13+
# Use Python 3.12 as the default version.
1414
PYTHON_SINGLE_TARGET="-pypy3_11 -python3_11 python3_12 -python3_13 -python3_14 -python3_13t -python3_14t"
15-
PYTHON_TARGETS="-pypy3_11 python3_11 python3_12 -python3_13 -python3_14 -python3_13t -python3_14t"
15+
PYTHON_TARGETS="-pypy3_11 -python3_11 python3_12 -python3_13 -python3_14 -python3_13t -python3_14t"
1616

1717
# Same as above, but for bootstrapping.
1818
BOOTSTRAP_USE="${BOOTSTRAP_USE} -python_single_target_pypy3_11 -python_single_target_python3_11 python_single_target_python3_12 -python_single_target_python3_13 -python_single_target_python3_14 -python_single_target_python3_13t -python_single_target_python3_14t"
19-
BOOTSTRAP_USE="${BOOTSTRAP_USE} -python_targets_pypy3_11 python_targets_python3_11 python_targets_python3_12 -python_targets_python3_13 -python_targets_python3_14 -python_targets_python3_13t -python_targets_python3_14t"
19+
BOOTSTRAP_USE="${BOOTSTRAP_USE} -python_targets_pypy3_11 -python_targets_python3_11 python_targets_python3_12 -python_targets_python3_13 -python_targets_python3_14 -python_targets_python3_13t -python_targets_python3_14t"
2020

2121

2222
# Never install cron or cron jobs

sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@
1717
# Do not install python versions that were "disabled" in
1818
# PYTHON_TARGETS. For some reason emerge still insists on installing
1919
# those as a dependency for some packages.
20-
<dev-lang/python-3.11
20+
<dev-lang/python-3.12
2121
>=dev-lang/python-3.13

sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@
33

44
FLATCAR_TYPE=generic
55

6-
# Use Python 3.12 as the default version.
7-
PYTHON_SINGLE_TARGET="-pypy3_11 -python3_11 python3_12 -python3_13 -python3_14 -python3_13t -python3_14t"
8-
PYTHON_TARGETS="-pypy3_11 -python3_11 python3_12 -python3_13 -python3_14 -python3_13t -python3_14t"
9-
106
USE="acpi usb cryptsetup policykit"
117
USE="${USE} -cros_host -expat -cairo -X -man"
128
USE="${USE} -acl -gpm -python"

sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.mask

Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Override python settings
2+
3+
# Use Python 3.12 as the default version, allow python 3.11 for a transition.
4+
PYTHON_SINGLE_TARGET="-pypy3_11 -python3_11 python3_12 -python3_13 -python3_14 -python3_13t -python3_14t"
5+
PYTHON_TARGETS="-pypy3_11 python3_11 python3_12 -python3_13 -python3_14 -python3_13t -python3_14t"
6+
7+
# Same as above, but for bootstrapping.
8+
BOOTSTRAP_USE="${BOOTSTRAP_USE} -python_single_target_pypy3_11 -python_single_target_python3_11 python_single_target_python3_12 -python_single_target_python3_13 -python_single_target_python3_14 -python_single_target_python3_13t -python_single_target_python3_14t"
9+
BOOTSTRAP_USE="${BOOTSTRAP_USE} -python_targets_pypy3_11 python_targets_python3_11 python_targets_python3_12 -python_targets_python3_13 -python_targets_python3_14 -python_targets_python3_13t -python_targets_python3_14t"
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
=dev-lang/python-3.11*

0 commit comments

Comments
 (0)