Re: [OE-core] [poky-contrib][PATCH 2/4] package.bbclass: Displays warnings for just licences in recipes.

["Peter Kjellerstedt" <peter.kjellerstedt@axis.com>]

> -----Original Message-----
> From: openembedded-core@lists.openembedded.org <openembedded-
> core@lists.openembedded.org> On Behalf Of Meh Mbeh Ida Delphine
> Sent: den 10 mars 2021 00:31
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [poky-contrib][PATCH 2/4] package.bbclass: Displays
> warnings for just licences in recipes.
> 
> After the comparism between computedpkglics and recipe lics, the warnings
> are displayed if and only if there are licenses in the recipes not found
> in the sources.
> 
> Signed-off-by: Ida Delphine <idadelm@gmail.com>
> ---
>  meta/classes/package.bbclass | 17 ++++++++++++-----
>  1 file changed, 12 insertions(+), 5 deletions(-)
> 
> diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
> index c127178f95..4e1be661b3 100644
> --- a/meta/classes/package.bbclass
> +++ b/meta/classes/package.bbclass
> @@ -1551,6 +1551,7 @@ PKGDESTWORK = "${WORKDIR}/pkgdata"
>  PKGDATA_VARS = "PN PE PV PR PKGE PKGV PKGR LICENSE DESCRIPTION SUMMARY RDEPENDS RPROVIDES RRECOMMENDS RSUGGESTS RREPLACES RCONFLICTS SECTION PKG ALLOW_EMPTY FILES CONFFILES FILES_INFO PACKAGE_ADD_METADATA pkg_postinst pkg_postrm pkg_preinst pkg_prerm"
> 
>  python emit_pkgdata() {
> +    import oe.license
>      from glob import glob
>      import json
>      import subprocess
> @@ -1748,8 +1749,8 @@ fi
>                      if r[0] not in computedlics:
>                          computedlics[r[0]] = set()
>                      computedlics[r[0]].add(filelics[subf])
> -        #if computedlics:
> -        #    bb.warn(str(computedlics))
> +
> +

One empty line is enough.

>          dvar = d.getVar('PKGD')
>          for f in computedlics:
>              shortf = f.replace(dvar, "")
> @@ -1762,13 +1763,19 @@ fi
>                      computedpkglics[pkg].update(computedlics[f])
>              if not found:
>                  bb.warn("%s not in %s" % (f, str(filemap)))
> -        #if computedpkglics:
> -        #    bb.warn(str(computedpkglics))
> +
>          for pkg in computedpkglics:
>              lic = d.getVar('LICENSE_%s' % (pkg))
>              if not lic:
>                  lic = d.getVar('LICENSE')
> -            bb.warn("License for package %s is %s vs %s" % (pkg, computedpkglics[pkg], lic))
> +
> +            # Splits the LICENSE values and canonicalise each license
> +            # in the set of split license(s)
> +            spdx_lic = oe.license.split_spdx_lic(lic, d)
> +
> +            # Displays warnings for licenses found in the recipes and not sources
> +            if spdx_lic - computedpkglics[pkg]:
> +                bb.warn("License for package %s is %s vs %s" % (pkg, computedpkglics[pkg], spdx_lic))
>  }
>  emit_pkgdata[dirs] = "${PKGDESTWORK}/runtime ${PKGDESTWORK}/runtime-reverse ${PKGDESTWORK}/runtime-rprovides"

Since you are now using a function from oe.license that references 
Bitbake variables, I believe you should add emit_pkgdata[vardeps] 
for those variables as bitbake will not pick them up automatically.

> 
> --
> 2.25.1

//Peter