From abe094e7896fe35d3de7a9d43646d5cf987726ad Mon Sep 17 00:00:00 2001 From: Johannes Schrimpf Date: Tue, 25 Apr 2023 11:15:32 +0200 Subject: [PATCH] python3targetconfig.bbclass: Extend PYTHONPATH instead of overwriting [YOCTO #15108] -- https://bugzilla.yoctoproject.org/show_bug.cgi?id=15108 Since the latest change, the PYTHONPATH is overwritten instead of extended. This leads to changed behavior and build errors of recipes where the PYTHONPATH is set before setup_target_config is run. Fixes: c9617c03bcee ("python3targetconfig.bbclass: use PYTHONPATH to point to the target config") (From OE-Core rev: cf31424aa7ce3308373899181aef0e503ead4776) Signed-off-by: Johannes Schrimpf [Luca: add Fixes: tag] Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 2442ab92f8610784d28d8d83056b643bd95b0b4e) Signed-off-by: Steve Sakoman --- meta/classes-recipe/python3targetconfig.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-recipe/python3targetconfig.bbclass b/meta/classes-recipe/python3targetconfig.bbclass index 22305fe176..08bc619398 100644 --- a/meta/classes-recipe/python3targetconfig.bbclass +++ b/meta/classes-recipe/python3targetconfig.bbclass @@ -12,7 +12,7 @@ DEPENDS:append = " ${EXTRA_PYTHON_DEPENDS}" setup_target_config() { export _PYTHON_SYSCONFIGDATA_NAME="_sysconfigdata" - export PYTHONPATH=${STAGING_LIBDIR}/python-sysconfigdata + export PYTHONPATH=${STAGING_LIBDIR}/python-sysconfigdata:$PYTHONPATH export PATH=${STAGING_EXECPREFIXDIR}/python-target-config/:$PATH }