SPDX: use 'AND' instead of '&' for master or >= blacksail

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>

Author: vermaete

superflore/generators/bitbake/yocto_recipe.py

@@ -56,6 +56,8 @@
     'walnascar': '5.2',
     'whinlatter': '5.3',
     'wrynose': '6.0',
+    'wrynose': '6.0',
+    'blacksail': '6.1',
 }
 
 
@@ -422,11 +424,15 @@ def get_recipe_text(self, distributor):
                 ret += '# Original license in package.xml:\n'
                 ret += '#         "' + self.license + '"\n'
         elif isinstance(self.license, list):
-            oe_lic = ' & '.join([get_license(lic) for lic in self.license])
-            if oe_lic != ' & '.join(self.license):
+            if Version(self._get_yocto_version(self.release)) < Version(yocto_releases['blacksail']):
+                _concat = "AND"
+            else:
+                _concat = "&"
+            oe_lic = f' {_concat} '.join([get_license(lic) for lic in self.license])
+            if oe_lic != f' {_concat} '.join(self.license):
                 ret += '# Original license in package.xml, joined with '
-                ret += '"&" when multiple license tags were used:\n'
-                ret += '#         "' + ' & '.join(self.license) + '"\n'
+                ret += f'"{_concat}" when multiple license tags were used:\n'
+                ret += '#         "' + f' {_concat} '.join(self.license) + '"\n'
         ret += 'LICENSE = "' + oe_lic + '"\n'
         ret += 'LIC_FILES_CHKSUM = "file://package.xml;beginline='
         ret += str(self.license_line)