| From a93c2a6b2c9db9c4bd30298da43c37c5e5c6236e Mon Sep 17 00:00:00 2001 |
| From: Richard Purdie <richard.purdie@linuxfoundation.org> |
| Date: Wed, 22 May 2024 13:58:23 +0200 |
| Subject: [PATCH 11/11] qemu: Ensure pip and the python venv aren't used for |
| meson |
| |
| Qemu wants to use a supported python version and a specific meson version |
| to "help" users and uses pip and creates a venv to do this. This is a nightmare |
| for us. Our versions stay up to date and should be supported so we don't |
| really need/want this wrapping. Tweak things to disable it. |
| |
| There was breakage from the wrapper shown by: |
| |
| bitbake qemu-system-native |
| <add DISTRO_FEATURES:remove = "opengl" to local.conf> |
| bitbake qemu-system-native -c configure |
| |
| which would crash. The issue is the change in configuration removes pieces |
| from the sysroot but pyc files remainm as do pieces of pip which causes |
| problems. |
| |
| Ideally we'd convince upstream to allow some way to disable the venv on |
| the understanding that if/when it breaks, we keep the pieces. The patch |
| as it stands is a workaround. |
| |
| Upstream-Status: Inappropriate [oe specific] |
| Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
| --- |
| configure | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| diff --git a/configure b/configure |
| index 482a1f8ef3..0da4bf3e4d 100755 |
| --- a/configure |
| +++ b/configure |
| @@ -938,14 +938,14 @@ python="$(command -v "$python")" |
| echo "python determined to be '$python'" |
| echo "python version: $($python --version)" |
| |
| -python="$($python -B "${source_path}/python/scripts/mkvenv.py" create pyvenv)" |
| +python=python3 |
| if test "$?" -ne 0 ; then |
| error_exit "python venv creation failed" |
| fi |
| |
| # Suppress writing compiled files |
| python="$python -B" |
| -mkvenv="$python ${source_path}/python/scripts/mkvenv.py" |
| +mkvenv=true |
| |
| # Finish preparing the virtual environment using vendored .whl files |
| |
| -- |
| 2.44.0 |
| |