package_qa_handle_error() from insane.bbclass handles display of warnings by
allowing the user decide whether they want the issues treated as warnings,
errors or hidden completely.
This is done by setting a variable "LICENSE_SOURCE_SPDX" in local.conf to
either "0" or "1".
Add SPDXLICENSEMAP variable to emit_pkgdata[vardeps]
Signed-off-by: Ida Delphine <idad...@gmail.com>
---
meta/classes/package.bbclass | 127 ++++++++++++++++++-----------------
1 file changed, 65 insertions(+), 62 deletions(-)
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index efdc169275..8cd7f3ad21 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1549,6 +1549,7 @@ python emit_pkgdata() {
import json
import subprocess
import oe.license
+ import bb.utils
def process_postinst_on_target(pkg, mlprefix):
pkgval = d.getVar('PKG_%s' % pkg)
@@ -1706,70 +1707,72 @@ fi
write_extra_runtime_pkgs(global_variants, packages, pkgdatadir)
sourceresult = d.getVar('TEMPDBGSRCMAPPING', False)
- sources = {}
- if sourceresult:
- for r in sourceresult:
- sources[r[0]] = r[1]
- with open(data_file + ".srclist", 'w') as f:
- f.write(json.dumps(sources, sort_keys=True))
-
- filelics = {}
- for dirent in [d.getVar('PKGD'), d.getVar('STAGING_DIR_TARGET')]:
- p = subprocess.Popen(["grep", 'SPDX-License-Identifier:', '-R',
'-I'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=dirent)
- out, err = p.communicate()
- if p.returncode == 0:
- for l in out.decode("utf-8").split("\n"):
- l = l.strip()
- if not l:
- continue
- l = l.split(":")
- if len(l) < 3:
- bb.warn(str(l))
- continue
- fn = "/" + l[0]
- lic = l[2].strip()
- if lic.endswith("*/"):
- lic = lic[:-2]
- lic = lic.strip()
- filelics[fn] = lic
- with open(data_file + ".filelics", 'w') as f:
- f.write(json.dumps(filelics, sort_keys=True))
-
- computedlics = {}
- computedpkglics = {}
- for r in sourceresult:
- for subf in r[1]:
- if subf in filelics:
- if r[0] not in computedlics:
- computedlics[r[0]] = set()
- computedlics[r[0]].add(filelics[subf])
- #if computedlics:
- # bb.warn(str(computedlics))
- dvar = d.getVar('PKGD')
- for f in computedlics:
- shortf = f.replace(dvar, "")
- found = False
- for pkg in filemap:
- if shortf in filemap[pkg]:
- found = True
- if pkg not in computedpkglics:
- computedpkglics[pkg] = set()
- 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')
- 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))
+ if bb.utils.to_boolean(d.getVar("LICENSE_SOURCE_SPDX")):
+ sources = {}
+ if sourceresult:
+ for r in sourceresult:
+ sources[r[0]] = r[1]
+ with open(data_file + ".srclist", 'w') as f:
+ f.write(json.dumps(sources, sort_keys=True))
+
+ filelics = {}
+ for dirent in [d.getVar('PKGD'), d.getVar('STAGING_DIR_TARGET')]:
+ p = subprocess.Popen(["grep", 'SPDX-License-Identifier:',
'-R', '-I'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, cwd=dirent)
+ out, err = p.communicate()
+ if p.returncode == 0:
+ for l in out.decode("utf-8").split("\n"):
+ l = l.strip()
+ if not l:
+ continue
+ l = l.split(":")
+ if len(l) < 3:
+ bb.warn(str(l))
+ continue
+ fn = "/" + l[0]
+ lic = l[2].strip()
+ if lic.endswith("*/"):
+ lic = lic[:-2]
+ lic = lic.strip()
+ filelics[fn] = lic
+ with open(data_file + ".filelics", 'w') as f:
+ f.write(json.dumps(filelics, sort_keys=True))
+
+ computedlics = {}
+ computedpkglics = {}
+ for r in sourceresult:
+ for subf in r[1]:
+ if subf in filelics:
+ if r[0] not in computedlics:
+ computedlics[r[0]] = set()
+ computedlics[r[0]].add(filelics[subf])
+ #if computedlics:
+ # bb.warn(str(computedlics))
+ dvar = d.getVar('PKGD')
+ for f in computedlics:
+ shortf = f.replace(dvar, "")
+ found = False
+ for pkg in filemap:
+ if shortf in filemap[pkg]:
+ found = True
+ if pkg not in computedpkglics:
+ computedpkglics[pkg] = set()
+ 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')
+ 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]:
+ package_qa_handle_error("LICENSE_SOURCE_SPDX", ("License
for package %s is %s vs %s" % (pkg, computedpkglics[pkg], spdx_lic)), d)
}
emit_pkgdata[dirs] = "${PKGDESTWORK}/runtime ${PKGDESTWORK}/runtime-reverse
${PKGDESTWORK}/runtime-rprovides"
+emit_pkgdata[vardeps] += "SPDXLICENSEMAP"
ldconfig_postinst_fragment() {
if [ x"$D" = "x" ]; then
--
2.25.1
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#149558):
https://lists.openembedded.org/g/openembedded-core/message/149558
Mute This Topic: https://lists.openembedded.org/mt/81371633/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
