diff options
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/0011-qemu-Ensure-pip-and-the-python-venv-aren-t-used-for-.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/0011-qemu-Ensure-pip-and-the-python-venv-aren-t-used-for-.patch | 55 |
1 files changed, 55 insertions, 0 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/0011-qemu-Ensure-pip-and-the-python-venv-aren-t-used-for-.patch b/meta/recipes-devtools/qemu/qemu/0011-qemu-Ensure-pip-and-the-python-venv-aren-t-used-for-.patch new file mode 100644 index 0000000000..c7bb9b1b47 --- /dev/null +++ b/meta/recipes-devtools/qemu/qemu/0011-qemu-Ensure-pip-and-the-python-venv-aren-t-used-for-.patch | |||
@@ -0,0 +1,55 @@ | |||
1 | From a93c2a6b2c9db9c4bd30298da43c37c5e5c6236e Mon Sep 17 00:00:00 2001 | ||
2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
3 | Date: Wed, 22 May 2024 13:58:23 +0200 | ||
4 | Subject: [PATCH 11/11] qemu: Ensure pip and the python venv aren't used for | ||
5 | meson | ||
6 | |||
7 | Qemu wants to use a supported python version and a specific meson version | ||
8 | to "help" users and uses pip and creates a venv to do this. This is a nightmare | ||
9 | for us. Our versions stay up to date and should be supported so we don't | ||
10 | really need/want this wrapping. Tweak things to disable it. | ||
11 | |||
12 | There was breakage from the wrapper shown by: | ||
13 | |||
14 | bitbake qemu-system-native | ||
15 | <add DISTRO_FEATURES:remove = "opengl" to local.conf> | ||
16 | bitbake qemu-system-native -c configure | ||
17 | |||
18 | which would crash. The issue is the change in configuration removes pieces | ||
19 | from the sysroot but pyc files remainm as do pieces of pip which causes | ||
20 | problems. | ||
21 | |||
22 | Ideally we'd convince upstream to allow some way to disable the venv on | ||
23 | the understanding that if/when it breaks, we keep the pieces. The patch | ||
24 | as it stands is a workaround. | ||
25 | |||
26 | Upstream-Status: Inappropriate [oe specific] | ||
27 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | ||
28 | --- | ||
29 | configure | 4 ++-- | ||
30 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
31 | |||
32 | diff --git a/configure b/configure | ||
33 | index 482a1f8ef3..0da4bf3e4d 100755 | ||
34 | --- a/configure | ||
35 | +++ b/configure | ||
36 | @@ -938,14 +938,14 @@ python="$(command -v "$python")" | ||
37 | echo "python determined to be '$python'" | ||
38 | echo "python version: $($python --version)" | ||
39 | |||
40 | -python="$($python -B "${source_path}/python/scripts/mkvenv.py" create pyvenv)" | ||
41 | +python=python3 | ||
42 | if test "$?" -ne 0 ; then | ||
43 | error_exit "python venv creation failed" | ||
44 | fi | ||
45 | |||
46 | # Suppress writing compiled files | ||
47 | python="$python -B" | ||
48 | -mkvenv="$python ${source_path}/python/scripts/mkvenv.py" | ||
49 | +mkvenv=true | ||
50 | |||
51 | # Finish preparing the virtual environment using vendored .whl files | ||
52 | |||
53 | -- | ||
54 | 2.44.0 | ||
55 | |||