mirror of
https://git.yoctoproject.org/poky
synced 2026-01-29 21:08:42 +01:00
lib/license: Move package license skip to library
Moves the code that skips packages with incompatible licenses to the library code so that it can be called in other locations (From OE-Core rev: 4f7a047c4a1e14bbb3bf593764aace1e25bcd4a4) Signed-off-by: Joshua Watt <JPEWhacker@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 86eb409e3c1b30110869ec5a0027ae2d48bbfe7f) Signed-off-by: Steve Sakoman <steve@sakoman.com>
This commit is contained in:
committed by
Steve Sakoman
parent
2cab0b9833
commit
8f0eab43ed
@@ -565,37 +565,10 @@ python () {
|
|||||||
|
|
||||||
bad_licenses = (d.getVar('INCOMPATIBLE_LICENSE') or "").split()
|
bad_licenses = (d.getVar('INCOMPATIBLE_LICENSE') or "").split()
|
||||||
|
|
||||||
check_license = False if pn.startswith("nativesdk-") else True
|
pkgs = d.getVar('PACKAGES').split()
|
||||||
for t in ["-native", "-cross-${TARGET_ARCH}", "-cross-initial-${TARGET_ARCH}",
|
if pkgs:
|
||||||
"-crosssdk-${SDK_SYS}", "-crosssdk-initial-${SDK_SYS}",
|
skipped_pkgs = oe.license.skip_incompatible_package_licenses(d, pkgs)
|
||||||
"-cross-canadian-${TRANSLATED_TARGET_ARCH}"]:
|
unskipped_pkgs = [p for p in pkgs if p not in skipped_pkgs]
|
||||||
if pn.endswith(d.expand(t)):
|
|
||||||
check_license = False
|
|
||||||
if pn.startswith("gcc-source-"):
|
|
||||||
check_license = False
|
|
||||||
|
|
||||||
if check_license and bad_licenses:
|
|
||||||
bad_licenses = oe.license.expand_wildcard_licenses(d, bad_licenses)
|
|
||||||
|
|
||||||
exceptions = (d.getVar("INCOMPATIBLE_LICENSE_EXCEPTIONS") or "").split()
|
|
||||||
|
|
||||||
for lic_exception in exceptions:
|
|
||||||
if ":" in lic_exception:
|
|
||||||
lic_exception = lic_exception.split(":")[1]
|
|
||||||
if lic_exception in oe.license.obsolete_license_list():
|
|
||||||
bb.fatal("Obsolete license %s used in INCOMPATIBLE_LICENSE_EXCEPTIONS" % lic_exception)
|
|
||||||
|
|
||||||
pkgs = d.getVar('PACKAGES').split()
|
|
||||||
skipped_pkgs = {}
|
|
||||||
unskipped_pkgs = []
|
|
||||||
for pkg in pkgs:
|
|
||||||
remaining_bad_licenses = oe.license.apply_pkg_license_exception(pkg, bad_licenses, exceptions)
|
|
||||||
|
|
||||||
incompatible_lic = oe.license.incompatible_license(d, remaining_bad_licenses, pkg)
|
|
||||||
if incompatible_lic:
|
|
||||||
skipped_pkgs[pkg] = incompatible_lic
|
|
||||||
else:
|
|
||||||
unskipped_pkgs.append(pkg)
|
|
||||||
|
|
||||||
if unskipped_pkgs:
|
if unskipped_pkgs:
|
||||||
for pkg in skipped_pkgs:
|
for pkg in skipped_pkgs:
|
||||||
|
|||||||
@@ -422,3 +422,42 @@ def check_license_format(d):
|
|||||||
'%s: LICENSE value "%s" has an invalid separator "%s" that is not ' \
|
'%s: LICENSE value "%s" has an invalid separator "%s" that is not ' \
|
||||||
'in the valid list of separators (%s)' %
|
'in the valid list of separators (%s)' %
|
||||||
(pn, licenses, element, license_operator_chars), d)
|
(pn, licenses, element, license_operator_chars), d)
|
||||||
|
|
||||||
|
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:
|
||||||
|
return {}
|
||||||
|
|
||||||
|
bad_licenses = expand_wildcard_licenses(d, bad_licenses)
|
||||||
|
|
||||||
|
exceptions = (d.getVar("INCOMPATIBLE_LICENSE_EXCEPTIONS") or "").split()
|
||||||
|
|
||||||
|
for lic_exception in exceptions:
|
||||||
|
if ":" in lic_exception:
|
||||||
|
lic_exception = lic_exception.split(":")[1]
|
||||||
|
if lic_exception in obsolete_license_list():
|
||||||
|
bb.fatal("Obsolete license %s used in INCOMPATIBLE_LICENSE_EXCEPTIONS" % lic_exception)
|
||||||
|
|
||||||
|
skipped_pkgs = {}
|
||||||
|
for pkg in pkgs:
|
||||||
|
remaining_bad_licenses = apply_pkg_license_exception(pkg, bad_licenses, exceptions)
|
||||||
|
|
||||||
|
incompatible_lic = incompatible_license(d, remaining_bad_licenses, pkg)
|
||||||
|
if incompatible_lic:
|
||||||
|
skipped_pkgs[pkg] = incompatible_lic
|
||||||
|
|
||||||
|
return skipped_pkgs
|
||||||
|
|||||||
Reference in New Issue
Block a user