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

Drop Python path override hack in profile.bashrc

Browse Source 
This hasn't been needed for a while, since Gentoo started handling
Python modules according to PEP 517. We now need util-linux with Python
support for Catalyst 4, and this hack erroneously causes the module to
be installed under /usr/lib64 rather than /usr/lib.

Signed-off-by: James Le Cuirot <jlecuirot@microsoft.com>
This commit is contained in:
James Le Cuirot 2024-06-28 23:15:58 +01:00
parent 6d96f2a9ac
commit 8d8be98228
No known key found for this signature in database
GPG Key ID: 1226415D00DD3137
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/profile.bashrc vendored
View File

@ -71,23 +71,6 @@ cros_setup_hooks() {
} }
cros_setup_hooks cros_setup_hooks
# Packages that use python will run a small python script to find the
# pythondir. Unfortunately, they query the host python to find out the
# paths for things, which means they inevitably guess wrong. Export
# the cached values ourselves and since we know these are going through
# autoconf, we can leverage ${libdir} that econf sets up automatically.
cros_pre_src_unpack_python_multilib_setup() {
# Avoid executing multiple times in a single build.
[[ ${am_cv_python_version:+set} == "set" ]] && return
local py=${PYTHON:-python}
local py_ver=$(${py} -c 'import sys;sys.stdout.write(sys.version[:4])')
export am_cv_python_version=${py_ver}
export am_cv_python_pythondir="\${libdir}/python${py_ver}/site-packages"
export am_cv_python_pyexecdir=${am_cv_python_pythondir}
}
# Since we're storing the wrappers in a board sysroot, make sure that # Since we're storing the wrappers in a board sysroot, make sure that
# is actually in our PATH. # is actually in our PATH.
cros_pre_pkg_setup_sysroot_build_bin_dir() { cros_pre_pkg_setup_sysroot_build_bin_dir() {