summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Schrimpf <dev@loewen-email.de>2023-04-25 11:15:32 +0200
committerSteve Sakoman <steve@sakoman.com>2023-05-18 04:29:33 -1000
commitabe094e7896fe35d3de7a9d43646d5cf987726ad (patch)
tree7a1f9fccef716cc8919bafede0c51c59c6a229e6
parent3dd115a78c940760b74227ffabc69f8540fcce70 (diff)
downloadpoky-abe094e7896fe35d3de7a9d43646d5cf987726ad.tar.gz
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 <dev@loewen-email.de> [Luca: add Fixes: tag] Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 2442ab92f8610784d28d8d83056b643bd95b0b4e) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/classes-recipe/python3targetconfig.bbclass2
1 files changed, 1 insertions, 1 deletions
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}"
12 12
13setup_target_config() { 13setup_target_config() {
14 export _PYTHON_SYSCONFIGDATA_NAME="_sysconfigdata" 14 export _PYTHON_SYSCONFIGDATA_NAME="_sysconfigdata"
15 export PYTHONPATH=${STAGING_LIBDIR}/python-sysconfigdata 15 export PYTHONPATH=${STAGING_LIBDIR}/python-sysconfigdata:$PYTHONPATH
16 export PATH=${STAGING_EXECPREFIXDIR}/python-target-config/:$PATH 16 export PATH=${STAGING_EXECPREFIXDIR}/python-target-config/:$PATH
17} 17}
18 18