[OE-core] [EXT] Re: [PATCH] insane.bbclass: fix QA-check to consider the PREFERRED_RPROVIDER for RDEPENDS

[Catalin Dan Udma]

Hi Ross,

I may be missing something in how to contribute to oe-core. I could apply the patch on latest 
master (eb8c7b5 Richard Purdie, "bitbake: HEADER: Drop it") on poky and poky-contrib:
- git://git.yoctoproject.org/poky
- https://git.yoctoproject.org/git/poky-contrib

Could you please help me understand where should I rebase?
For reference, I attached also the patch I applied with "git am".

Thank you,
Catalin

> -----Original Message-----
> From: Burton, Ross [mailto:ross.burton at intel.com]
> Sent: Monday, April 29, 2019 4:26 PM
> To: Catalin Dan Udma <catalin-dan.udma at nxp.com>
> Cc: Openembedded-core at lists.openembedded.org
> Subject: [EXT] Re: [OE-core] [PATCH] insane.bbclass: fix QA-check to consider
> the PREFERRED_RPROVIDER for RDEPENDS
> 
> Caution: EXT Email
> 
> I just ran into this, but the patch doesn't apply to master anymore.
> Can you rebase?
> 
> Thanks,
> Ross
> 
> On Tue, 2 Apr 2019 at 23:39, Catalin Dan Udma <catalin-dan.udma at nxp.com>
> wrote:
> >
> > Ping.
> >
> > Thanks,
> > Catalin Udma
> >
> > > -----Original Message-----
> > > From: Catalin Dan Udma
> > > Sent: Tuesday, March 5, 2019 3:36 PM
> > > To: Openembedded-core at lists.openembedded.org
> > > Cc: Catalin Dan Udma <catalin-dan.udma at nxp.com>
> > > Subject: [OE-core][PATCH] insane.bbclass: fix QA-check to consider the
> > > PREFERRED_RPROVIDER for RDEPENDS
> > >
> > > QA-check looks in the RDEPENDS list without taking into consideration
> that a
> > > specific package may have a PREFERRED_RPROVIDER defined.
> > > If PREFERRED_RPROVIDER is set, QA-check will ignore that settings and
> will
> > > consider the original package, resulting in QA-check errors:
> > >       ERROR: do_packate_qa: QA Issue: <...>, but no providers found in
> > >       RDEPENDS_<package>? [file-rdeps]
> > > The fix is to replace the original package in the QA-check with the new
> > > package defined in PREFERRED_RPROVIDER, if it’s set.
> > >
> > > Signed-off-by: Catalin Udma <catalin-dan.udma at nxp.com>
> > > ---
> > >  meta/classes/insane.bbclass | 6 ++++++
> > >  1 file changed, 6 insertions(+)
> > >
> > > diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
> > > index 6411884..165233b 100644
> > > --- a/meta/classes/insane.bbclass
> > > +++ b/meta/classes/insane.bbclass
> > > @@ -689,6 +689,9 @@ def package_qa_check_rdepends(pkg, pkgdest,
> skip,
> > > taskdeps, packages, d):
> > >          # Now do the sanity check!!!
> > >          if "build-deps" not in skip:
> > >              for rdepend in rdepends:
> > > +                pref_rdepend =
> localdata.getVar("PREFERRED_RPROVIDER_%s" %
> > > rdepend)
> > > +                if pref_rdepend:
> > > +                    rdepend = pref_rdepend
> > >                  if "-dbg" in rdepend and "debug-deps" not in skip:
> > >                      error_msg = "%s rdepends on %s" % (pkg,rdepend)
> > >                      package_qa_handle_error("debug-deps", error_msg, d)
> > > @@ -739,6 +742,9 @@ def package_qa_check_rdepends(pkg, pkgdest,
> skip,
> > > taskdeps, packages, d):
> > >                  while next:
> > >                      new = []
> > >                      for rdep in next:
> > > +                        pref_rdep =
> localdata.getVar("PREFERRED_RPROVIDER_%s" %
> > > rdep)
> > > +                        if pref_rdep:
> > > +                            rdep = pref_rdep
> > >                          rdep_data = oe.packagedata.read_subpkgdata(rdep, d)
> > >                          sub_rdeps = rdep_data.get("RDEPENDS_" + rdep)
> > >                          if not sub_rdeps:
> > > --
> > > 2.7.4
> >
> > --
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core at lists.openembedded.org
> >
> https://eur01.safelinks.protection.outlook.com/?url=http%3A%2F%2Flists.o
> penembedded.org%2Fmailman%2Flistinfo%2Fopenembedded-
> core&amp;data=02%7C01%7Ccatalin-
> dan.udma%40nxp.com%7C2ed6ecae67224c18f69208d6cca62e99%7C686ea1d
> 3bc2b4c6fa92cd99c5c301635%7C0%7C1%7C636921411454726374&amp;sdata
> =W9Ke%2B%2B%2FXsXU2%2BHvd1Zh5LnkWYWhyb8nAX9iYX3Cuy%2BY%3D
> &amp;reserved=0
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-insane.bbclass-fix-QA-check-to-consider-the-PREFERRE.PATCH
Type: application/octet-stream
Size: 2292 bytes
Desc: 0001-insane.bbclass-fix-QA-check-to-consider-the-PREFERRE.PATCH
URL: <http://lists.openembedded.org/pipermail/openembedded-core/attachments/20190507/b922fd62/attachment.obj>