mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2026-05-05 04:06:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

overlay profiles: Ease into Python bump with transitional profile

Browse Source 
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>
This commit is contained in:
Krzesimir Nowak 2026-01-19 11:56:42 +01:00
parent 965d344a92
commit d4e33f7a4c
6 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,13 +10,13 @@ USE_EXPAND="${USE_EXPAND} GO_VERSION"
USE="${USE} -cracklib -cups -tcpd -berkdb"
# Use Python 3.12 as the default version, allow python 3.11 for a transition.
# Use Python 3.12 as the default version.
PYTHON_SINGLE_TARGET="-pypy3_11 -python3_11 python3_12 -python3_13 -python3_14 -python3_13t -python3_14t"
PYTHON_TARGETS="-pypy3_11 python3_11 python3_12 -python3_13 -python3_14 -python3_13t -python3_14t"
PYTHON_TARGETS="-pypy3_11 -python3_11 python3_12 -python3_13 -python3_14 -python3_13t -python3_14t"
# Same as above, but for bootstrapping.
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"
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"
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"
# Never install cron or cron jobs

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

@ -17,5 +17,5 @@
# Do not install python versions that were "disabled" in
# PYTHON_TARGETS. For some reason emerge still insists on installing
# those as a dependency for some packages.
<dev-lang/python-3.11
<dev-lang/python-3.12
>=dev-lang/python-3.13

4
sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults vendored
View File

@ -3,10 +3,6 @@
FLATCAR_TYPE=generic
# Use Python 3.12 as the default version.
PYTHON_SINGLE_TARGET="-pypy3_11 -python3_11 python3_12 -python3_13 -python3_14 -python3_13t -python3_14t"
PYTHON_TARGETS="-pypy3_11 -python3_11 python3_12 -python3_13 -python3_14 -python3_13t -python3_14t"
USE="acpi usb cryptsetup policykit"
USE="${USE} -cros_host -expat -cairo -X -man"
USE="${USE} -acl -gpm -python"

8
sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.mask vendored
View File

@ -1,8 +0,0 @@
# Copyright (c) 2026 The Flatcar Maintainers.
# Distributed under the terms of the GNU General Public License v2
# Do not install python versions that were "disabled" in
# PYTHON_TARGETS. For some reason emerge still insists on installing
# those as a dependency for some packages.
<dev-lang/python-3.12
>=dev-lang/python-3.13

9
sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/transition/make.defaults vendored Normal file
View File

@ -0,0 +1,9 @@
# Override python settings
# Use Python 3.12 as the default version, allow python 3.11 for a transition.
PYTHON_SINGLE_TARGET="-pypy3_11 -python3_11 python3_12 -python3_13 -python3_14 -python3_13t -python3_14t"
PYTHON_TARGETS="-pypy3_11 python3_11 python3_12 -python3_13 -python3_14 -python3_13t -python3_14t"
# Same as above, but for bootstrapping.
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"
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"

1
sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/transition/package.unmask vendored Normal file
View File

@ -0,0 +1 @@
=dev-lang/python-3.11*