diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2020-04-02 19:05:14 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-05-27 07:34:34 +0100 |
| commit | ba1fb60b3980c86794f8a4c23e3a984f9e3590e1 (patch) | |
| tree | 743432ac392b3ac20b538fc7a95030355d4557c0 | |
| parent | f260626c4c5d0b8aa86694e89838e29f18f05236 (diff) | |
| download | poky-ba1fb60b3980c86794f8a4c23e3a984f9e3590e1.tar.gz | |
prservice.py: fix do_package with newer Python in Ubuntu 20.04
* with Ubuntu 20.04 which is using python 3.8 I'm seeing a lot of errors like:
ERROR: libxml2-2.9.10-r0 do_package: Can NOT get PRAUTO, exception No module named '_sysconfigdata'
not sure what caused this from python 3.8, but this seems to work
* PRserv is enabled with:
PRSERV_HOST = "localhost:0"
(From OE-Core rev: 4b26eaf7152fb712aba47a0c746333578f58ee8d)
(From OE-Core rev: eaa6de34442906ad6285aa069f17a7cb2a64e970)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/lib/oe/prservice.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/lib/oe/prservice.py b/meta/lib/oe/prservice.py index b1132ccb11..3a5ef8d921 100644 --- a/meta/lib/oe/prservice.py +++ b/meta/lib/oe/prservice.py | |||
| @@ -3,6 +3,10 @@ | |||
| 3 | # | 3 | # |
| 4 | 4 | ||
| 5 | def prserv_make_conn(d, check = False): | 5 | def prserv_make_conn(d, check = False): |
| 6 | # Otherwise this fails when called from recipes which e.g. inherit python3native (which sets _PYTHON_SYSCONFIGDATA_NAME) with: | ||
| 7 | # No module named '_sysconfigdata' | ||
| 8 | if '_PYTHON_SYSCONFIGDATA_NAME' in os.environ: | ||
| 9 | del os.environ['_PYTHON_SYSCONFIGDATA_NAME'] | ||
| 6 | import prserv.serv | 10 | import prserv.serv |
| 7 | host_params = list([_f for _f in (d.getVar("PRSERV_HOST") or '').split(':') if _f]) | 11 | host_params = list([_f for _f in (d.getVar("PRSERV_HOST") or '').split(':') if _f]) |
| 8 | try: | 12 | try: |
