summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2020-04-02 19:05:14 +0200
committerAnuj Mittal <anuj.mittal@intel.com>2020-04-28 09:57:21 +0800
commitc314c6695acca9ea68e38359fb03a94afa37bb2b (patch)
treee50c642f24f6058046a4fcb528a4edd4d09b8cf6
parente69b89575e5ccec243658e09936908dd9e5d45ef (diff)
downloadopenembedded-core-contrib-c314c6695acca9ea68e38359fb03a94afa37bb2b.tar.gz
openembedded-core-contrib-c314c6695acca9ea68e38359fb03a94afa37bb2b.tar.bz2
openembedded-core-contrib-c314c6695acca9ea68e38359fb03a94afa37bb2b.zip
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) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit c23d6f77994698e71d9a011cddec1237158b15ca) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
-rw-r--r--meta/lib/oe/prservice.py4
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 @@
#
def prserv_make_conn(d, check = False):
+ # Otherwise this fails when called from recipes which e.g. inherit python3native (which sets _PYTHON_SYSCONFIGDATA_NAME) with:
+ # No module named '_sysconfigdata'
+ if '_PYTHON_SYSCONFIGDATA_NAME' in os.environ:
+ del os.environ['_PYTHON_SYSCONFIGDATA_NAME']
import prserv.serv
host_params = list([_f for _f in (d.getVar("PRSERV_HOST") or '').split(':') if _f])
try: