Revert "prservice.py: fix do_package with newer Python in Ubuntu 20.04"
Quoted 22 lines
-----Original Message-----
From: [email protected] <[email protected]> On Behalf Of Peter Kjellerstedt
Sent: den 5 juni 2020 17:50
To: [email protected]
Subject: [OE-core] [master][dunfell] Revert "prservice.py: fixdo_packagewith newer Python in Ubuntu 20.04"This reverts commit
4b26eaf7152fb712aba47a0c746333578f58ee8d.Since the problem occurred while importing prserv, the solution has been moved into it instead so it is solved for all cases where prserv is imported, most notably when using devtool.
Signed-off-by Peter Kjellerstedt <[email protected]>--- meta/lib/oe/prservice.py | 4 ---- 1 file changed, 4 deletions(-)meta/lib/oe/prservice.py +0
-0
meta/lib/oe/prservice.py line 8
Quoted 10 lines
meta/lib/oe/prservice.py +0
-4@@ -3,10 +3,6 @@ # 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:
There is a corresponding patch sent to the bitbake-devel list that should be integrated before/together with this.
//Peter