diff mbox series

[langdale,2/2] externalsrc.bbclass: Remove a trailing slash from ${B}

Message ID 20221105154203.273684-2-pkj@axis.com
State New
Headers show
Series [langdale,1/2] externalsrc.bbclass: fix git repo detection | expand

Commit Message

Peter Kjellerstedt Nov. 5, 2022, 3:42 p.m. UTC 
From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>

The trailing slash in ${B} caused -fdebug-prefix-map=${B}=... to not
match as intended, resulting in ${TMPDIR} ending up in files in
${PN}-dbg when externalsrc was in use, which in turn triggered buildpath
QA warnings.

Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
---
 meta/classes/externalsrc.bbclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Steve Sakoman Nov. 5, 2022, 5:59 p.m. UTC | #1 
I've already got these first two patches in stable/langdale-nut:

https://git.openembedded.org/openembedded-core-contrib/log/?h=stable/langdale-nut

And your 3/3 seems to be identical to 2/3.  Am I missing something?

Steve

On Sat, Nov 5, 2022 at 5:42 AM Peter Kjellerstedt
<peter.kjellerstedt@axis.com> wrote:
>
> From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
>
> The trailing slash in ${B} caused -fdebug-prefix-map=${B}=... to not
> match as intended, resulting in ${TMPDIR} ending up in files in
> ${PN}-dbg when externalsrc was in use, which in turn triggered buildpath
> QA warnings.
>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> ---
>  meta/classes/externalsrc.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass
> index 5905342589..75fb91bcb0 100644
> --- a/meta/classes/externalsrc.bbclass
> +++ b/meta/classes/externalsrc.bbclass
> @@ -61,7 +61,7 @@ python () {
>          if externalsrcbuild:
>              d.setVar('B', externalsrcbuild)
>          else:
> -            d.setVar('B', '${WORKDIR}/${BPN}-${PV}/')
> +            d.setVar('B', '${WORKDIR}/${BPN}-${PV}')
>
>          local_srcuri = []
>          fetch = bb.fetch2.Fetch((d.getVar('SRC_URI') or '').split(), d)
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#172748): https://lists.openembedded.org/g/openembedded-core/message/172748
> Mute This Topic: https://lists.openembedded.org/mt/94828874/3620601
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [steve@sakoman.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Martin Jansa Nov. 5, 2022, 6:28 p.m. UTC | #2 
In my inbox it looks differently, 2/3 and 3/3 aren't identical and both are
indeed in langdale-nut.

Then there is 1/2 identical to 2/3 (probably from sending last 3
externalsrc.bbclass changes and then re-sending after realizing that only
last 2 are needed).

1/3 is  already in langdale:
https://git.openembedded.org/openembedded-core/commit/?h=langdale&id=6d9364e5f3535954f65cbbc694ee7933ac1d664f

I think all is fine in langdale-nut.

Cheers,

On Sat, Nov 5, 2022 at 6:59 PM Steve Sakoman <steve@sakoman.com> wrote:

> I've already got these first two patches in stable/langdale-nut:
>
>
> https://git.openembedded.org/openembedded-core-contrib/log/?h=stable/langdale-nut
>
> And your 3/3 seems to be identical to 2/3.  Am I missing something?
>
> Steve
>
> On Sat, Nov 5, 2022 at 5:42 AM Peter Kjellerstedt
> <peter.kjellerstedt@axis.com> wrote:
> >
> > From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> >
> > The trailing slash in ${B} caused -fdebug-prefix-map=${B}=... to not
> > match as intended, resulting in ${TMPDIR} ending up in files in
> > ${PN}-dbg when externalsrc was in use, which in turn triggered buildpath
> > QA warnings.
> >
> > Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> > ---
> >  meta/classes/externalsrc.bbclass | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta/classes/externalsrc.bbclass
> b/meta/classes/externalsrc.bbclass
> > index 5905342589..75fb91bcb0 100644
> > --- a/meta/classes/externalsrc.bbclass
> > +++ b/meta/classes/externalsrc.bbclass
> > @@ -61,7 +61,7 @@ python () {
> >          if externalsrcbuild:
> >              d.setVar('B', externalsrcbuild)
> >          else:
> > -            d.setVar('B', '${WORKDIR}/${BPN}-${PV}/')
> > +            d.setVar('B', '${WORKDIR}/${BPN}-${PV}')
> >
> >          local_srcuri = []
> >          fetch = bb.fetch2.Fetch((d.getVar('SRC_URI') or '').split(), d)
> >
> >
> >
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#172754):
> https://lists.openembedded.org/g/openembedded-core/message/172754
> Mute This Topic: https://lists.openembedded.org/mt/94828874/3617156
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [
> Martin.Jansa@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
>
Peter Kjellerstedt Nov. 5, 2022, 7:36 p.m. UTC | #3 
Argh, the second series (with three patches) is intended for Kirkstone, not Langdale.

//Peter

From: Martin Jansa <martin.jansa@gmail.com>
Sent: den 5 november 2022 19:28
To: Steve Sakoman <steve@sakoman.com>
Cc: Peter Kjellerstedt <peter.kjellerstedt@axis.com>; openembedded-core@lists.openembedded.org
Subject: Re: [OE-core] [langdale][PATCH 2/2] externalsrc.bbclass: Remove a trailing slash from ${B}

In my inbox it looks differently, 2/3 and 3/3 aren't identical and both are indeed in langdale-nut.

Then there is 1/2 identical to 2/3 (probably from sending last 3 externalsrc.bbclass changes and then re-sending after realizing that only last 2 are needed).

1/3 is  already in langdale:
https://git.openembedded.org/openembedded-core/commit/?h=langdale&id=6d9364e5f3535954f65cbbc694ee7933ac1d664f

I think all is fine in langdale-nut.

Cheers,

On Sat, Nov 5, 2022 at 6:59 PM Steve Sakoman <steve@sakoman.com<mailto:steve@sakoman.com>> wrote:
I've already got these first two patches in stable/langdale-nut:

https://git.openembedded.org/openembedded-core-contrib/log/?h=stable/langdale-nut

And your 3/3 seems to be identical to 2/3.  Am I missing something?

Steve

On Sat, Nov 5, 2022 at 5:42 AM Peter Kjellerstedt
<peter.kjellerstedt@axis.com<mailto:peter.kjellerstedt@axis.com>> wrote:
>
> From: Peter Kjellerstedt <peter.kjellerstedt@axis.com<mailto:peter.kjellerstedt@axis.com>>
>
> The trailing slash in ${B} caused -fdebug-prefix-map=${B}=... to not
> match as intended, resulting in ${TMPDIR} ending up in files in
> ${PN}-dbg when externalsrc was in use, which in turn triggered buildpath
> QA warnings.
>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com<mailto:alexandre.belloni@bootlin.com>>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org<mailto:richard.purdie@linuxfoundation.org>>
> Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com<mailto:peter.kjellerstedt@axis.com>>
> ---
>  meta/classes/externalsrc.bbclass | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass
> index 5905342589..75fb91bcb0 100644
> --- a/meta/classes/externalsrc.bbclass
> +++ b/meta/classes/externalsrc.bbclass
> @@ -61,7 +61,7 @@ python () {
>          if externalsrcbuild:
>              d.setVar('B', externalsrcbuild)
>          else:
> -            d.setVar('B', '${WORKDIR}/${BPN}-${PV}/')
> +            d.setVar('B', '${WORKDIR}/${BPN}-${PV}')
>
>          local_srcuri = []
>          fetch = bb.fetch2.Fetch((d.getVar('SRC_URI') or '').split(), d)
>
>
>

-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#172754): https://lists.openembedded.org/g/openembedded-core/message/172754
Mute This Topic: https://lists.openembedded.org/mt/94828874/3617156
Group Owner: openembedded-core+owner@lists.openembedded.org<mailto:openembedded-core%2Bowner@lists.openembedded.org>
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [Martin.Jansa@gmail.com<mailto:Martin.Jansa@gmail.com>]
-=-=-=-=-=-=-=-=-=-=-=-
Steve Sakoman Nov. 5, 2022, 7:40 p.m. UTC | #4 
On Sat, Nov 5, 2022 at 9:36 AM Peter Kjellerstedt
<peter.kjellerstedt@axis.com> wrote:
>
> Argh, the second series (with three patches) is intended for Kirkstone, not Langdale.

No worries!  I think we are good in kirkstone too:

https://git.openembedded.org/openembedded-core-contrib/log/?h=stable/kirkstone-nut

Patch series for both will go out for review in the next day or so
once autobuilder testing is done.

Steve

> From: Martin Jansa <martin.jansa@gmail.com>
> Sent: den 5 november 2022 19:28
> To: Steve Sakoman <steve@sakoman.com>
> Cc: Peter Kjellerstedt <peter.kjellerstedt@axis.com>; openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] [langdale][PATCH 2/2] externalsrc.bbclass: Remove a trailing slash from ${B}
>
>
>
> In my inbox it looks differently, 2/3 and 3/3 aren't identical and both are indeed in langdale-nut.
>
>
>
> Then there is 1/2 identical to 2/3 (probably from sending last 3 externalsrc.bbclass changes and then re-sending after realizing that only last 2 are needed).
>
>
>
> 1/3 is  already in langdale:
>
> https://git.openembedded.org/openembedded-core/commit/?h=langdale&id=6d9364e5f3535954f65cbbc694ee7933ac1d664f
>
>
>
> I think all is fine in langdale-nut.
>
>
>
> Cheers,
>
>
>
> On Sat, Nov 5, 2022 at 6:59 PM Steve Sakoman <steve@sakoman.com> wrote:
>
> I've already got these first two patches in stable/langdale-nut:
>
> https://git.openembedded.org/openembedded-core-contrib/log/?h=stable/langdale-nut
>
> And your 3/3 seems to be identical to 2/3.  Am I missing something?
>
> Steve
>
> On Sat, Nov 5, 2022 at 5:42 AM Peter Kjellerstedt
> <peter.kjellerstedt@axis.com> wrote:
> >
> > From: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> >
> > The trailing slash in ${B} caused -fdebug-prefix-map=${B}=... to not
> > match as intended, resulting in ${TMPDIR} ending up in files in
> > ${PN}-dbg when externalsrc was in use, which in turn triggered buildpath
> > QA warnings.
> >
> > Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> > ---
> >  meta/classes/externalsrc.bbclass | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass
> > index 5905342589..75fb91bcb0 100644
> > --- a/meta/classes/externalsrc.bbclass
> > +++ b/meta/classes/externalsrc.bbclass
> > @@ -61,7 +61,7 @@ python () {
> >          if externalsrcbuild:
> >              d.setVar('B', externalsrcbuild)
> >          else:
> > -            d.setVar('B', '${WORKDIR}/${BPN}-${PV}/')
> > +            d.setVar('B', '${WORKDIR}/${BPN}-${PV}')
> >
> >          local_srcuri = []
> >          fetch = bb.fetch2.Fetch((d.getVar('SRC_URI') or '').split(), d)
> >
> >
> >
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#172754): https://lists.openembedded.org/g/openembedded-core/message/172754
> Mute This Topic: https://lists.openembedded.org/mt/94828874/3617156
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [Martin.Jansa@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
Peter Kjellerstedt Nov. 5, 2022, 7:46 p.m. UTC | #5 
> -----Original Message-----
> From: Steve Sakoman <steve@sakoman.com>
> Sent: den 5 november 2022 20:41
> To: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> Cc: Martin Jansa <martin.jansa@gmail.com>; openembedded-core@lists.openembedded.org
> Subject: Re: [OE-core] [langdale][PATCH 2/2] externalsrc.bbclass: Remove a trailing slash from ${B}
> 
> On Sat, Nov 5, 2022 at 9:36 AM Peter Kjellerstedt <peter.kjellerstedt@axis.com> wrote:
> >
> > Argh, the second series (with three patches) is intended for Kirkstone,
> > not Langdale.
> 
> No worries!  I think we are good in kirkstone too:
> 
> https://git.openembedded.org/openembedded-core-contrib/log/?h=stable/kirkstone-nut
> 
> Patch series for both will go out for review in the next day or so
> once autobuilder testing is done.
> 
> Steve

Ok, good. Since I typically work with the poky repository, I do not 
normally see the *-nut branches, and tend to forget they exist in 
another repository.

//Peter
Steve Sakoman Nov. 5, 2022, 7:52 p.m. UTC | #6 
On Sat, Nov 5, 2022 at 9:46 AM Peter Kjellerstedt
<peter.kjellerstedt@axis.com> wrote:
>
> > -----Original Message-----
> > From: Steve Sakoman <steve@sakoman.com>
> > Sent: den 5 november 2022 20:41
> > To: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
> > Cc: Martin Jansa <martin.jansa@gmail.com>; openembedded-core@lists.openembedded.org
> > Subject: Re: [OE-core] [langdale][PATCH 2/2] externalsrc.bbclass: Remove a trailing slash from ${B}
> >
> > On Sat, Nov 5, 2022 at 9:36 AM Peter Kjellerstedt <peter.kjellerstedt@axis.com> wrote:
> > >
> > > Argh, the second series (with three patches) is intended for Kirkstone,
> > > not Langdale.
> >
> > No worries!  I think we are good in kirkstone too:
> >
> > https://git.openembedded.org/openembedded-core-contrib/log/?h=stable/kirkstone-nut
> >
> > Patch series for both will go out for review in the next day or so
> > once autobuilder testing is done.
> >
> > Steve
>
> Ok, good. Since I typically work with the poky repository, I do not
> normally see the *-nut branches, and tend to forget they exist in
> another repository.

I've got -nut branches in poky-contrib, so you could look there too :-)

Steve
diff mbox series

Patch

diff --git a/meta/classes/externalsrc.bbclass b/meta/classes/externalsrc.bbclass
index 5905342589..75fb91bcb0 100644
--- a/meta/classes/externalsrc.bbclass
+++ b/meta/classes/externalsrc.bbclass
@@ -61,7 +61,7 @@  python () {
         if externalsrcbuild:
             d.setVar('B', externalsrcbuild)
         else:
-            d.setVar('B', '${WORKDIR}/${BPN}-${PV}/')
+            d.setVar('B', '${WORKDIR}/${BPN}-${PV}')
 
         local_srcuri = []
         fetch = bb.fetch2.Fetch((d.getVar('SRC_URI') or '').split(), d)