From 32232d2ec1f32bb0de6e9bde7c7f19a470bf6d8c Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Fri, 13 Jun 2025 14:16:19 +0100 Subject: [PATCH] oe/license_finder: support extra hashes being passed to find_licenses When using the license finder the caller might know some more license hashes, for example if it is updating existing metadata. Allow the caller to pass more hashes that can be used when identifying licenses. (From OE-Core rev: 9011bc307fcdccb144b75d77b36bbc5c8d4bd96d) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/lib/oe/license_finder.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/lib/oe/license_finder.py b/meta/lib/oe/license_finder.py index 1bdc39e1c5..16f5d7c94c 100644 --- a/meta/lib/oe/license_finder.py +++ b/meta/lib/oe/license_finder.py @@ -145,10 +145,11 @@ def find_license_files(srctree, first_only=False): return licfiles -def match_licenses(licfiles, srctree, d): +def match_licenses(licfiles, srctree, d, extra_hashes={}): md5sums = {} md5sums.update(_load_hash_csv(d)) md5sums.update(_crunch_known_licenses(d)) + md5sums.update(extra_hashes) licenses = [] for licfile in sorted(licfiles): @@ -169,9 +170,9 @@ def match_licenses(licfiles, srctree, d): return licenses -def find_licenses(srctree, d, first_only=False): +def find_licenses(srctree, d, first_only=False, extra_hashes={}): licfiles = find_license_files(srctree, first_only) - licenses = match_licenses(licfiles, srctree, d) + licenses = match_licenses(licfiles, srctree, d, extra_hashes) # FIXME should we grab at least one source file with a license header and add that too?