Skip to content

Commit 590e64f

Browse files
rpurdiestephanosio
authored andcommitted
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 <[email protected]>
1 parent 8178c37 commit 590e64f

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

configure

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -969,14 +969,14 @@ python="$(command -v "$python")"
969969
echo "python determined to be '$python'"
970970
echo "python version: $($python --version)"
971971

972-
python="$($python -B "${source_path}/python/scripts/mkvenv.py" create pyvenv)"
972+
python=python3
973973
if test "$?" -ne 0 ; then
974974
error_exit "python venv creation failed"
975975
fi
976976

977977
# Suppress writing compiled files
978978
python="$python -B"
979-
mkvenv="$python ${source_path}/python/scripts/mkvenv.py"
979+
mkvenv=true
980980

981981
# Finish preparing the virtual environment using vendored .whl files
982982

0 commit comments

Comments
 (0)