summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2023-04-27 21:01:40 +0200
committerSteve Sakoman <steve@sakoman.com>2023-05-18 04:29:33 -1000
commit1805cb9232e7dfe3d4763a51282d00c7b41c7ab5 (patch)
tree450b31986de540f475d861066a9ec5e1d90d72e7
parent96a7cf333166ebfe55e0ce7a171dd60ccb3556bf (diff)
downloadpoky-1805cb9232e7dfe3d4763a51282d00c7b41c7ab5.tar.gz
license.bbclass: Include LICENSE in the output when it fails to parse
(From OE-Core rev: faa2baeb4256f0df3c34badf5cb30febeede5ab8) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 1a5197760da3890cc80ac7da8d589766612d9051) Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r--meta/classes-global/license.bbclass2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/classes-global/license.bbclass b/meta/classes-global/license.bbclass
index 560acb8b6f..23625f0104 100644
--- a/meta/classes-global/license.bbclass
+++ b/meta/classes-global/license.bbclass
@@ -229,7 +229,7 @@ def find_license_files(d):
229 bb.fatal('%s: %s' % (d.getVar('PF'), exc)) 229 bb.fatal('%s: %s' % (d.getVar('PF'), exc))
230 except SyntaxError: 230 except SyntaxError:
231 oe.qa.handle_error("license-syntax", 231 oe.qa.handle_error("license-syntax",
232 "%s: Failed to parse it's LICENSE field." % (d.getVar('PF')), d) 232 "%s: Failed to parse LICENSE: %s" % (d.getVar('PF'), d.getVar('LICENSE')), d)
233 # Add files from LIC_FILES_CHKSUM to list of license files 233 # Add files from LIC_FILES_CHKSUM to list of license files
234 lic_chksum_paths = defaultdict(OrderedDict) 234 lic_chksum_paths = defaultdict(OrderedDict)
235 for path, data in sorted(lic_chksums.items()): 235 for path, data in sorted(lic_chksums.items()):