@@ -561,23 +561,28 @@ def filter_pkg_license_list(pkg, lst):
return pkg_lst
+def incompatible_license_check_needed(d, pn):
+ """
+ Return False for recipes that INCOMPATIBLE_LICENSE does not apply to:
+ native, nativesdk, cross and cross-canadian recipes, and gcc-source.
+ """
+ if pn.startswith("nativesdk-") or pn.startswith("gcc-source-"):
+ return False
+ for t in ["-native", "-cross-${TARGET_ARCH}", "-cross-initial-${TARGET_ARCH}",
+ "-crosssdk-${SDK_SYS}", "-crosssdk-initial-${SDK_SYS}",
+ "-cross-canadian-${TRANSLATED_TARGET_ARCH}"]:
+ if pn.endswith(d.expand(t)):
+ return False
+ return True
+
def skip_incompatible_package_licenses(d, pkgs):
if not pkgs:
return {}
pn = d.getVar("PN")
- check_license = False if pn.startswith("nativesdk-") else True
- for t in ["-native", "-cross-${TARGET_ARCH}", "-cross-initial-${TARGET_ARCH}",
- "-crosssdk-${SDK_SYS}", "-crosssdk-initial-${SDK_SYS}",
- "-cross-canadian-${TRANSLATED_TARGET_ARCH}"]:
- if pn.endswith(d.expand(t)):
- check_license = False
- if pn.startswith("gcc-source-"):
- check_license = False
-
bad_licenses = (d.getVar('INCOMPATIBLE_LICENSE') or "").split()
- if not check_license or not bad_licenses:
+ if not incompatible_license_check_needed(d, pn) or not bad_licenses:
return {}
bad_licenses = expand_wildcard_licenses(d, bad_licenses)
Move the check for recipes INCOMPATIBLE_LICENSE does not apply to (native, nativesdk, cross, cross-canadian and gcc-source) out of skip_incompatible_package_licenses() into its own function, so it can be reused when checking packages at image/SDK creation time. No functional change. AI-Generated: Claude Opus 5.5 (Claude Code) Signed-off-by: Sean Nyekjaer <sean@geanix.com> --- meta/lib/oe/license.py | 25 +++++++++++++++---------- 1 file changed, 15 insertions(+), 10 deletions(-)