Hi Saul,
Am 03.02.2022 um 18:07 schrieb Saul Wold via lists.openembedded.org:
When a file can not be identified by checksum and they contain an SPDX
License-Identifier tag, use it as the found license.
[YOCTO #14529]
Tested with LICENSE files that contain 1 or more SPDX-License-Identifier tags
Can you please give an example for an project with use a
SPDX-License-Identifier inside a license file.
Signed-off-by: Saul Wold <saul.w...@windriver.com>
---
scripts/lib/recipetool/create.py | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
diff --git a/scripts/lib/recipetool/create.py b/scripts/lib/recipetool/create.py
index 507a230511..9149c2d94f 100644
--- a/scripts/lib/recipetool/create.py
+++ b/scripts/lib/recipetool/create.py
@@ -1221,14 +1221,20 @@ def guess_license(srctree, d):
for licfile in sorted(licfiles):
md5value = bb.utils.md5_file(licfile)
license = md5sums.get(md5value, None)
+ license_list = []
Could you please use an other name. We already have licenses and it is
hard to distinguish the difference between licenses and license_list.
if not license:
license, crunched_md5, lictext = crunch_license(licfile)
if lictext and not license:
- license = 'Unknown'
- logger.info("Please add the following line for '%s' to a
'lib/recipetool/licenses.csv' " \
- "and replace `Unknown` with the license:\n" \
- "%s,Unknown" % (os.path.relpath(licfile, srctree),
md5value))
- if license:
+ spdx_re = re.compile('SPDX-License-Identifier:\s+([-A-Za-z\d.
]+)[ |\n|\r\n]*?')
+ license_list = re.findall(spdx_re, "\n".join(lictext))
+ if not license_list:
+ license_list.append('Unknown')
+ logger.info("Please add the following line for '%s' to a
'lib/recipetool/licenses.csv' " \
+ "and replace `Unknown` with the license:\n" \
+ "%s,Unknown" % (os.path.relpath(licfile, srctree),
md5value))
+ else:
+ license_list.append(license)
+ for license in license_list:
licenses.append((license, os.path.relpath(licfile, srctree),
md5value))
# FIXME should we grab at least one source file with a license header and add that too?
Regards
Stefan
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#161340):
https://lists.openembedded.org/g/openembedded-core/message/161340
Mute This Topic: https://lists.openembedded.org/mt/88887504/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
