Skip to content

Commit 38ba1b1

Browse files
committed
SPDX: use 'AND' instead of '&'
The SPDX specification no longer accepts '&' as a license operator. Replace it with 'AND' to comply with the SPDX rules used by Yocto. Signed-off-by: Jan Vermaete <jan.vermaete@gmail.com>
1 parent b10efe8 commit 38ba1b1

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

superflore/generators/bitbake/yocto_recipe.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -422,11 +422,11 @@ def get_recipe_text(self, distributor):
422422
ret += '# Original license in package.xml:\n'
423423
ret += '# "' + self.license + '"\n'
424424
elif isinstance(self.license, list):
425-
oe_lic = ' & '.join([get_license(lic) for lic in self.license])
426-
if oe_lic != ' & '.join(self.license):
425+
oe_lic = ' AND '.join([get_license(lic) for lic in self.license])
426+
if oe_lic != ' AND '.join(self.license):
427427
ret += '# Original license in package.xml, joined with '
428-
ret += '"&" when multiple license tags were used:\n'
429-
ret += '# "' + ' & '.join(self.license) + '"\n'
428+
ret += '"AND" when multiple license tags were used:\n'
429+
ret += '# "' + ' AND '.join(self.license) + '"\n'
430430
ret += 'LICENSE = "' + oe_lic + '"\n'
431431
ret += 'LIC_FILES_CHKSUM = "file://package.xml;beginline='
432432
ret += str(self.license_line)

0 commit comments

Comments
 (0)