From bdf2d94c35b7e5ed1723f987696a6c865bff212c Mon Sep 17 00:00:00 2001 From: Elizabeth Flanagan Date: Fri, 23 Mar 2012 16:51:42 -0700 Subject: INCOMPATIBLE_LICENSE: support for spdx and pkg licenses This adds a few things to the incompatible license functionality 1. INCOMPATIBLE_LICENSE was unable to distinguish any variation within LICENSE (e.g. GPLv3 v. GPLv3.0). This now utilizes the SPDXLICENSEMAP of the license indicated as INCOMPATIBLE_LICENSE 2. Given a recipe where the main LICENSE was incompatible but a package of the recipe was compatible, the entire recipe would be excluded. This allows us some finer grained control over what exactly gets excluded. (From OE-Core rev: a8d7246f7b13ef2636c325263c8bfa22552d7a57) Signed-off-by: Elizabeth Flanagan Signed-off-by: Richard Purdie --- meta/classes/base.bbclass | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) (limited to 'meta/classes/base.bbclass') diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index c8ed5447e4..ef9267a126 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -389,17 +389,43 @@ python () { dont_want_license = d.getVar('INCOMPATIBLE_LICENSE', True) - if dont_want_license and not pn.endswith("-native") and not pn.endswith("-cross") and not pn.endswith("-cross-initial") and not pn.endswith("-cross-intermediate") and not pn.endswith("-crosssdk-intermediate") and not pn.endswith("-crosssdk") and not pn.endswith("-crosssdk-initial"): - hosttools_whitelist = (d.getVar('HOSTTOOLS_WHITELIST_%s' % dont_want_license, True) or "").split() - lgplv2_whitelist = (d.getVar('LGPLv2_WHITELIST_%s' % dont_want_license, True) or "").split() - dont_want_whitelist = (d.getVar('WHITELIST_%s' % dont_want_license, True) or "").split() - if pn not in hosttools_whitelist and pn not in lgplv2_whitelist and pn not in dont_want_whitelist: + if dont_want_license and not pn.endswith("-native") and not pn.endswith("-cross") and not pn.endswith("-cross-initial") and not pn.endswith("-cross-intermediate") and not pn.endswith("-crosssdk-intermediate") and not pn.endswith("-crosssdk") and not pn.endswith("-crosssdk-initial") and not pn.endswith("-nativesdk"): + # Internally, we'll use the license mapping. This way INCOMPATIBLE_LICENSE = "GPLv2" and + # INCOMPATIBLE_LICENSE = "GPLv2.0" will pick up all variations of GPL-2.0 + spdx_license = return_spdx(d, dont_want_license) + hosttools_whitelist = (d.getVar('HOSTTOOLS_WHITELIST_%s' % dont_want_license, True) or d.getVar('HOSTTOOLS_WHITELIST_%s' % spdx_license, True) or "").split() + lgplv2_whitelist = (d.getVar('LGPLv2_WHITELIST_%s' % dont_want_license, True) or d.getVar('HOSTTOOLS_WHITELIST_%s' % spdx_license, True) or "").split() + dont_want_whitelist = (d.getVar('WHITELIST_%s' % dont_want_license, True) or d.getVar('HOSTTOOLS_WHITELIST_%s' % spdx_license, True) or "").split() + if pn not in hosttools_whitelist and pn not in lgplv2_whitelist and pn not in dont_want_whitelist: this_license = d.getVar('LICENSE', True) - if incompatible_license(d,dont_want_license): - bb.note("SKIPPING %s because it's %s" % (pn, this_license)) + # At this point we know the recipe contains an INCOMPATIBLE_LICENSE, however it may contain packages that do not. + packages = d.getVar('PACKAGES', True).split() + dont_skip_recipe = False + skipped_packages = {} + unskipped_packages = [] + for pkg in packages: + if incompatible_license(d, dont_want_license, pkg): + skipped_packages[pkg] = this_license + dont_skip_recipe = True + else: + unskipped_packages.append(pkg) + if not unskipped_packages: + # if we hit here and have excluded all packages, then we can just exclude the recipe + dont_skip_recipe = False + elif skipped_packages and unskipped_packages: + for pkg, license in skipped_packages.iteritems(): + bb.note("SKIPPING the package " + pkg + " at do_rootfs because it's " + this_license) + d.setVar('LICENSE_EXCLUSION-' + pkg, 1) + for index, pkg in enumerate(unskipped_packages): + bb.note("INCLUDING the package " + pkg) + + if dont_skip_recipe is False and incompatible_license(d, dont_want_license): + bb.note("SKIPPING recipe %s because it's %s" % (pn, this_license)) raise bb.parse.SkipPackage("incompatible with license %s" % this_license) + + srcuri = d.getVar('SRC_URI', True) # Svn packages should DEPEND on subversion-native if "svn://" in srcuri: -- cgit v1.2.3-54-g00ecf