[PATCH v2] insane.bbclass: Skip patches not in oe-core by full path

[PATCH v2] insane.bbclass: Skip patches not in oe-core by full path

[Yang Xu]

The full path of patch may contain '/meta/' but not in oe-core, skip
patches by checking it starts with oe-core full path or not.

Signed-off-by: Yang Xu <yang.xu@mediatek.com>
---
 meta/classes-global/insane.bbclass | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/classes-global/insane.bbclass b/meta/classes-global/insane.bbclass
index 46ea41e271..42daf4388e 100644
--- a/meta/classes-global/insane.bbclass
+++ b/meta/classes-global/insane.bbclass
@@ -1214,11 +1214,12 @@ python do_qa_patch() {
     import re
     from oe import patch
 
+    coremeta_path = os.path.join(d.getVar('COREBASE'), 'meta/')
     for url in patch.src_patches(d):
        (_, _, fullpath, _, _, _) = bb.fetch.decodeurl(url)
 
        # skip patches not in oe-core
-       if '/meta/' not in fullpath:
+       if not os.path.abspath(fullpath).startswith(os.path.abspath(coremeta_path)):
            continue
 
        kinda_status_re = re.compile(r"^.*upstream.*status.*$", re.IGNORECASE | re.MULTILINE)
-- 
2.25.1

Re: [OE-core] [PATCH v2] insane.bbclass: Skip patches not in oe-core by full path

[Alexandre Belloni]

Hello,

This doesn't seem to work as expected:

https://autobuilder.yoctoproject.org/typhoon/#/builders/120/builds/1599/steps/12/logs/stdio

https://autobuilder.yoctoproject.org/typhoon/#/builders/100/builds/3296/steps/12/logs/stdio

https://autobuilder.yoctoproject.org/typhoon/#builders/128/builds/495/steps/13/logs/stdio

On 15/08/2022 05:39:35+0000, Yang Xu via lists.openembedded.org wrote:
> The full path of patch may contain '/meta/' but not in oe-core, skip
> patches by checking it starts with oe-core full path or not.
> 
> Signed-off-by: Yang Xu <yang.xu@mediatek.com>
> ---
>  meta/classes-global/insane.bbclass | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/meta/classes-global/insane.bbclass b/meta/classes-global/insane.bbclass
> index 46ea41e271..42daf4388e 100644
> --- a/meta/classes-global/insane.bbclass
> +++ b/meta/classes-global/insane.bbclass
> @@ -1214,11 +1214,12 @@ python do_qa_patch() {
>      import re
>      from oe import patch
>  
> +    coremeta_path = os.path.join(d.getVar('COREBASE'), 'meta/')
>      for url in patch.src_patches(d):
>         (_, _, fullpath, _, _, _) = bb.fetch.decodeurl(url)
>  
>         # skip patches not in oe-core
> -       if '/meta/' not in fullpath:
> +       if not os.path.abspath(fullpath).startswith(os.path.abspath(coremeta_path)):
>             continue
>  
>         kinda_status_re = re.compile(r"^.*upstream.*status.*$", re.IGNORECASE | re.MULTILINE)
> -- 
> 2.25.1
> 

> 
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#169350): https://lists.openembedded.org/g/openembedded-core/message/169350
> Mute This Topic: https://lists.openembedded.org/mt/93030817/3617179
> Group Owner: openembedded-core+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [alexandre.belloni@bootlin.com]
> -=-=-=-=-=-=-=-=-=-=-=-
> 


-- 
Alexandre Belloni, co-owner and COO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com

Re: [OE-core] [PATCH v2] insane.bbclass: Skip patches not in oe-core by full path

[Yang Xu]

Hi Alexandre,

Sorry for my neglience. Error caused by the last "/" was eaten by
os.path.abspath.

I have fixed and submitted PATCH v3.

Thank you

On Wed, 2022-08-17 at 19:24 +0200, Alexandre Belloni wrote:
> Hello,
> 
> This doesn't seem to work as expected:
> 
> 
https://urldefense.com/v3/__https://autobuilder.yoctoproject.org/typhoon/*/builders/120/builds/1599/steps/12/logs/stdio__;Iw!!CTRNKA9wMg0ARbw!w2oEYTVQJHnJaZ1uIyOM8anxM71iSFQOOkD0yUlbiPPnPzMEZNzYT-4fATdVatAd$
>  
> 
> 
https://urldefense.com/v3/__https://autobuilder.yoctoproject.org/typhoon/*/builders/100/builds/3296/steps/12/logs/stdio__;Iw!!CTRNKA9wMg0ARbw!w2oEYTVQJHnJaZ1uIyOM8anxM71iSFQOOkD0yUlbiPPnPzMEZNzYT-4fAS5I-4JV$
>  
> 
> 
https://urldefense.com/v3/__https://autobuilder.yoctoproject.org/typhoon/*builders/128/builds/495/steps/13/logs/stdio__;Iw!!CTRNKA9wMg0ARbw!w2oEYTVQJHnJaZ1uIyOM8anxM71iSFQOOkD0yUlbiPPnPzMEZNzYT-4fAWjB-itS$
>  
> 
> On 15/08/2022 05:39:35+0000, Yang Xu via lists.openembedded.org
> wrote:
> > The full path of patch may contain '/meta/' but not in oe-core,
> > skip
> > patches by checking it starts with oe-core full path or not.
> > 
> > Signed-off-by: Yang Xu <yang.xu@mediatek.com>
> > ---
> >  meta/classes-global/insane.bbclass | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > diff --git a/meta/classes-global/insane.bbclass b/meta/classes-
> > global/insane.bbclass
> > index 46ea41e271..42daf4388e 100644
> > --- a/meta/classes-global/insane.bbclass
> > +++ b/meta/classes-global/insane.bbclass
> > @@ -1214,11 +1214,12 @@ python do_qa_patch() {
> >      import re
> >      from oe import patch
> >  
> > +    coremeta_path = os.path.join(d.getVar('COREBASE'), 'meta/')
> >      for url in patch.src_patches(d):
> >         (_, _, fullpath, _, _, _) = bb.fetch.decodeurl(url)
> >  
> >         # skip patches not in oe-core
> > -       if '/meta/' not in fullpath:
> > +       if not
> > os.path.abspath(fullpath).startswith(os.path.abspath(coremeta_path)
> > ):
> >             continue
> >  
> >         kinda_status_re = re.compile(r"^.*upstream.*status.*$",
> > re.IGNORECASE | re.MULTILINE)
> > -- 
> > 2.25.1
> > 
> > 
> > -=-=-=-=-=-=-=-=-=-=-=-
> > Links: You receive all messages sent to this group.
> > View/Reply Online (#169350): 
> > https://urldefense.com/v3/__https://lists.openembedded.org/g/openembedded-core/message/169350__;!!CTRNKA9wMg0ARbw!w2oEYTVQJHnJaZ1uIyOM8anxM71iSFQOOkD0yUlbiPPnPzMEZNzYT-4fARANYK9G$
> >  
> > Mute This Topic: 
> > https://urldefense.com/v3/__https://lists.openembedded.org/mt/93030817/3617179__;!!CTRNKA9wMg0ARbw!w2oEYTVQJHnJaZ1uIyOM8anxM71iSFQOOkD0yUlbiPPnPzMEZNzYT-4fARYBjDjv$
> >  
> > Group Owner: openembedded-core+owner@lists.openembedded.org
> > Unsubscribe: 
> > https://urldefense.com/v3/__https://lists.openembedded.org/g/openembedded-core/unsub__;!!CTRNKA9wMg0ARbw!w2oEYTVQJHnJaZ1uIyOM8anxM71iSFQOOkD0yUlbiPPnPzMEZNzYT-4fAQIdRTcQ$
> > $  [alexandre.belloni@bootlin.com]
> > -=-=-=-=-=-=-=-=-=-=-=-
> > 
> 
>