diff mbox series

python3targetconfig.bbclass: Extend PYTHONPATH instead of overwriting

Message ID 20230425091532.8086-1-dev@loewen-email.de
State Accepted, archived
Commit 2442ab92f8610784d28d8d83056b643bd95b0b4e
Headers show
Series python3targetconfig.bbclass: Extend PYTHONPATH instead of overwriting | expand

Commit Message

dev@loewen-email.de April 25, 2023, 9:15 a.m. UTC
From: Johannes Schrimpf <dev@loewen-email.de>

[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.

Signed-off-by: Johannes Schrimpf <dev@loewen-email.de>
---
 meta/classes-recipe/python3targetconfig.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Tim Orling April 25, 2023, 2:25 p.m. UTC | #1
On Tue, Apr 25, 2023 at 2:15 AM <dev@loewen-email.de> wrote:

> From: Johannes Schrimpf <dev@loewen-email.de>
>
> [YOCTO #15108] -- https://bugzilla.yoctoproject.org/show_bug.cgi?id=15108
>
> Since the latest change,


We should mention the commit where the change was made:
https://git.openembedded.org/openembedded-core/commit/meta/classes-recipe/python3targetconfig.bbclass?id=c9617c03bceee54dc540318cada392799b137bd5

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.
>
> Signed-off-by: Johannes Schrimpf <dev@loewen-email.de>
> ---
>  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
>  }
>
> --
> 2.37.1 (Apple Git-137.1)
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#180375):
> https://lists.openembedded.org/g/openembedded-core/message/180375
> Mute This Topic: https://lists.openembedded.org/mt/98489203/924729
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> ticotimo@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
Luca Ceresoli April 26, 2023, 8:08 a.m. UTC | #2
Hi Tim, Johannes,

On Tue, 25 Apr 2023 07:25:58 -0700
"Tim Orling" <ticotimo@gmail.com> wrote:

> On Tue, Apr 25, 2023 at 2:15 AM <dev@loewen-email.de> wrote:
> 
> > From: Johannes Schrimpf <dev@loewen-email.de>
> >
> > [YOCTO #15108] -- https://bugzilla.yoctoproject.org/show_bug.cgi?id=15108
> >
> > Since the latest change,  
> 
> 
> We should mention the commit where the change was made:
> https://git.openembedded.org/openembedded-core/commit/meta/classes-recipe/python3targetconfig.bbclass?id=c9617c03bceee54dc540318cada392799b137bd5

Good idea. I'm taking this patch for testing and adding a 'Fixes' tag.
No need to resend.

Best regards,
Luca
diff mbox series

Patch

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
 }