* [PATCH 0/1] base/license: Incompatible License fixes @ 2012-11-29 19:08 Elizabeth Flanagan 2012-11-29 19:08 ` [PATCH 1/1] base/license.bbclass: handle multiple INCOMPATIBLE_LICENSEs Elizabeth Flanagan 0 siblings, 1 reply; 9+ messages in thread From: Elizabeth Flanagan @ 2012-11-29 19:08 UTC (permalink / raw) To: openembedded-core Some minor changes to Andy Ross's patch to INCOMPATIBLE_LICENSE The following changes since commit 247b6a3754c2c50318e2a73d79981ba0e9cb560b: gstreamer, gst-plugins*: fix localdata (2012-11-28 15:25:33 +0000) are available in the git repository at: git://git.yoctoproject.org/poky-contrib eflanagan/incompat http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=eflanagan/incompat Andy Ross (1): base/license.bbclass: handle multiple INCOMPATIBLE_LICENSEs meta/classes/base.bbclass | 67 ++++++++++++++++++++-------------------- meta/classes/license.bbclass | 70 ++++++++++++++++-------------------------- 2 files changed, 59 insertions(+), 78 deletions(-) -- 1.7.9.5 ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/1] base/license.bbclass: handle multiple INCOMPATIBLE_LICENSEs 2012-11-29 19:08 [PATCH 0/1] base/license: Incompatible License fixes Elizabeth Flanagan @ 2012-11-29 19:08 ` Elizabeth Flanagan 2012-11-30 4:31 ` Saul Wold 2012-12-06 5:00 ` Saul Wold 0 siblings, 2 replies; 9+ messages in thread From: Elizabeth Flanagan @ 2012-11-29 19:08 UTC (permalink / raw) To: openembedded-core From: Andy Ross <andy.ross@windriver.com> Allow INCOMPATIBLE_LICENSE to be a whitespace-separated list of incompatible license strings and/or glob patterns. Also fix wildcarding: the string in INCOMPATIBLE_LICENSE was clearly intended to match with wildcards (e.g. "*GPLv3" to match both GPLv3 and LGPLv3), but this was broken because of a bug in return_spdx() which would die with a runtime error when there was no SPDXLICENSEMAP entry for the string. Signed-off-by: Andy Ross <andy.ross@windriver.com> Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com> --- meta/classes/base.bbclass | 67 ++++++++++++++++++++-------------------- meta/classes/license.bbclass | 70 ++++++++++++++++-------------------------- 2 files changed, 59 insertions(+), 78 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 0ee9d2e..4fc0559 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -524,43 +524,42 @@ python () { raise bb.parse.SkipPackage("incompatible with machine %s (not in COMPATIBLE_MACHINE)" % this_machine) - 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") and not pn.endswith("-cross-canadian-%s" % d.getVar('TRANSLATED_TARGET_ARCH', True)) and not pn.startswith("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) - # 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 + bad_licenses = (d.getVar('INCOMPATIBLE_LICENSE', True) or "").split() + + check_license = True + for t in ["-native", "-cross", "-cross-initial", "-cross-intermediate", "-crosssdk-intermediate", "-crosssdk", "-crosssdk-initial", "-nativesdk"]: + if pn.endswith(t): + check_license = False + + if check_license and bad_licenses: + whitelist = [] + for lic in bad_licenses: + for w in ["HOSTTOOLS_WHITELIST_", "LGPLv2_WHITELIST_", "WHITELIST_"]: + whitelist.extend((d.getVar(w + lic, True) or "").split()) + spdx_license = return_spdx(d, lic) + if spdx_license: + whitelist.extend((d.getVar('HOSTTOOLS_WHITELIST_%s' % spdx_license, True) or "").split()) + if not pn in whitelist: + recipe_license = d.getVar('LICENSE', True) + pkgs = d.getVar('PACKAGES', True).split() + skipped_pkgs = [] + unskipped_pkgs = [] + for pkg in pkgs: + if incompatible_license(d, bad_licenses, pkg): + skipped_pkgs.append(pkg) 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) + unskipped_pkgs.append(pkg) + some_skipped = skipped_pkgs and unskipped_pkgs + all_skipped = skipped_pkgs and not unskipped_pkgs + if some_skipped: + for pkg in skipped_pkgs: + bb.note("SKIPPING the package " + pkg + " at do_rootfs because it's " + recipe_license) d.setVar('LICENSE_EXCLUSION-' + pkg, 1) - for index, pkg in enumerate(unskipped_packages): + for pkg in unskipped_pkgs: 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) - - + elif all_skipped or incompatible_license(d, bad_licenses): + bb.note("SKIPPING recipe %s because it's %s" % (pn, recipe_license)) + raise bb.parse.SkipPackage("incompatible with license %s" % recipe_license) srcuri = d.getVar('SRC_URI', True) # Svn packages should DEPEND on subversion-native diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index c7ca4a6..9205cde 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -207,14 +207,11 @@ python do_populate_lic() { def return_spdx(d, license): """ - This function returns the spdx mapping of a license. - """ - if d.getVarFlag('SPDXLICENSEMAP', license) != None: - return license - else: - return d.getVarFlag('SPDXLICENSEMAP', license_type) - -def incompatible_license(d, dont_want_license, package=""): + This function returns the spdx mapping of a license if it exists. + """ + return d.getVarFlag('SPDXLICENSEMAP', license, True) + +def incompatible_license(d, dont_want_licenses, package=None): """ This function checks if a recipe has only incompatible licenses. It also take into consideration 'or' operand. @@ -223,45 +220,30 @@ def incompatible_license(d, dont_want_license, package=""): import oe.license from fnmatch import fnmatchcase as fnmatch pn = d.getVar('PN', True) - dont_want_licenses = [] - dont_want_licenses.append(d.getVar('INCOMPATIBLE_LICENSE', True)) - recipe_license = d.getVar('LICENSE', True) - if package != "": - if d.getVar('LICENSE_' + pn + '-' + package, True): - license = d.getVar('LICENSE_' + pn + '-' + package, True) - else: - license = recipe_license - else: - license = recipe_license - spdx_license = return_spdx(d, dont_want_license) - dont_want_licenses.append(spdx_license) - - def include_license(license): - if any(fnmatch(license, pattern) for pattern in dont_want_licenses): + license = d.getVar("LICENSE_%s-%s" % (pn, package), True) if package else None + if not license: + license = d.getVar('LICENSE', True) + + def license_ok(license): + for dwl in dont_want_licenses: + # If you want to exclude license named generically 'X', we + # surely want to exclude 'X+' as well. In consequence, we + # will exclude a trailing '+' character from LICENSE in + # case INCOMPATIBLE_LICENSE is not a 'X+' license. + lic = license + if not re.search('\+$', dwl): + lic = re.sub('\+', '', license) + if fnmatch(lic, dwl): return False - else: - return True + return True - def choose_licenses(a, b): - if all(include_license(lic) for lic in a): - return a - else: - return b + # Handles an "or" or two license sets provided by + # flattened_licenses(), pick one that works if possible. + def choose_lic_set(a, b): + return a if all(license_ok(lic) for lic in a) else b - """ - If you want to exlude license named generically 'X', we surely want to exlude 'X+' as well. - In consequence, we will exclude the '+' character from LICENSE in case INCOMPATIBLE_LICENSE - is not a 'X+' license. - """ - if not re.search(r'[+]',dont_want_license): - licenses=oe.license.flattened_licenses(re.sub(r'[+]', '', license), choose_licenses) - else: - licenses=oe.license.flattened_licenses(license, choose_licenses) - - for onelicense in licenses: - if not include_license(onelicense): - return True - return False + licenses=oe.license.flattened_licenses(license, choose_lic_set) + return any(not license_ok(l) for l in licenses) def check_license_flags(d): """ -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 1/1] base/license.bbclass: handle multiple INCOMPATIBLE_LICENSEs 2012-11-29 19:08 ` [PATCH 1/1] base/license.bbclass: handle multiple INCOMPATIBLE_LICENSEs Elizabeth Flanagan @ 2012-11-30 4:31 ` Saul Wold 2012-11-30 16:47 ` Andy Ross 2012-12-06 5:00 ` Saul Wold 1 sibling, 1 reply; 9+ messages in thread From: Saul Wold @ 2012-11-30 4:31 UTC (permalink / raw) To: Elizabeth Flanagan, Andy Ross; +Cc: openembedded-core On 11/29/2012 11:08 AM, Elizabeth Flanagan wrote: > From: Andy Ross <andy.ross@windriver.com> > > Allow INCOMPATIBLE_LICENSE to be a whitespace-separated list of > incompatible license strings and/or glob patterns. > > Also fix wildcarding: the string in INCOMPATIBLE_LICENSE was clearly > intended to match with wildcards (e.g. "*GPLv3" to match both GPLv3 > and LGPLv3), but this was broken because of a bug in return_spdx() > which would die with a runtime error when there was no SPDXLICENSEMAP > entry for the string. > There still seems to be a problem with this patch, try building core-image-minimal and core-image-basic, checkout the failure from the autobuilder: http://autobuilder.yoctoproject.org:8010/builders/nightly-non-gpl3/builds/372/steps/shell_28/logs/stdio Sau! > Signed-off-by: Andy Ross <andy.ross@windriver.com> > Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com> > --- > meta/classes/base.bbclass | 67 ++++++++++++++++++++-------------------- > meta/classes/license.bbclass | 70 ++++++++++++++++-------------------------- > 2 files changed, 59 insertions(+), 78 deletions(-) > > diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass > index 0ee9d2e..4fc0559 100644 > --- a/meta/classes/base.bbclass > +++ b/meta/classes/base.bbclass > @@ -524,43 +524,42 @@ python () { > raise bb.parse.SkipPackage("incompatible with machine %s (not in COMPATIBLE_MACHINE)" % this_machine) > > > - 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") and not pn.endswith("-cross-canadian-%s" % d.getVar('TRANSLATED_TARGET_ARCH', True)) and not pn.startswith("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) > - # 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 > + bad_licenses = (d.getVar('INCOMPATIBLE_LICENSE', True) or "").split() > + > + check_license = True > + for t in ["-native", "-cross", "-cross-initial", "-cross-intermediate", "-crosssdk-intermediate", "-crosssdk", "-crosssdk-initial", "-nativesdk"]: > + if pn.endswith(t): > + check_license = False > + > + if check_license and bad_licenses: > + whitelist = [] > + for lic in bad_licenses: > + for w in ["HOSTTOOLS_WHITELIST_", "LGPLv2_WHITELIST_", "WHITELIST_"]: > + whitelist.extend((d.getVar(w + lic, True) or "").split()) > + spdx_license = return_spdx(d, lic) > + if spdx_license: > + whitelist.extend((d.getVar('HOSTTOOLS_WHITELIST_%s' % spdx_license, True) or "").split()) > + if not pn in whitelist: > + recipe_license = d.getVar('LICENSE', True) > + pkgs = d.getVar('PACKAGES', True).split() > + skipped_pkgs = [] > + unskipped_pkgs = [] > + for pkg in pkgs: > + if incompatible_license(d, bad_licenses, pkg): > + skipped_pkgs.append(pkg) > 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) > + unskipped_pkgs.append(pkg) > + some_skipped = skipped_pkgs and unskipped_pkgs > + all_skipped = skipped_pkgs and not unskipped_pkgs > + if some_skipped: > + for pkg in skipped_pkgs: > + bb.note("SKIPPING the package " + pkg + " at do_rootfs because it's " + recipe_license) > d.setVar('LICENSE_EXCLUSION-' + pkg, 1) > - for index, pkg in enumerate(unskipped_packages): > + for pkg in unskipped_pkgs: > 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) > - > - > + elif all_skipped or incompatible_license(d, bad_licenses): > + bb.note("SKIPPING recipe %s because it's %s" % (pn, recipe_license)) > + raise bb.parse.SkipPackage("incompatible with license %s" % recipe_license) > > srcuri = d.getVar('SRC_URI', True) > # Svn packages should DEPEND on subversion-native > diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass > index c7ca4a6..9205cde 100644 > --- a/meta/classes/license.bbclass > +++ b/meta/classes/license.bbclass > @@ -207,14 +207,11 @@ python do_populate_lic() { > > def return_spdx(d, license): > """ > - This function returns the spdx mapping of a license. > - """ > - if d.getVarFlag('SPDXLICENSEMAP', license) != None: > - return license > - else: > - return d.getVarFlag('SPDXLICENSEMAP', license_type) > - > -def incompatible_license(d, dont_want_license, package=""): > + This function returns the spdx mapping of a license if it exists. > + """ > + return d.getVarFlag('SPDXLICENSEMAP', license, True) > + > +def incompatible_license(d, dont_want_licenses, package=None): > """ > This function checks if a recipe has only incompatible licenses. It also take into consideration 'or' > operand. > @@ -223,45 +220,30 @@ def incompatible_license(d, dont_want_license, package=""): > import oe.license > from fnmatch import fnmatchcase as fnmatch > pn = d.getVar('PN', True) > - dont_want_licenses = [] > - dont_want_licenses.append(d.getVar('INCOMPATIBLE_LICENSE', True)) > - recipe_license = d.getVar('LICENSE', True) > - if package != "": > - if d.getVar('LICENSE_' + pn + '-' + package, True): > - license = d.getVar('LICENSE_' + pn + '-' + package, True) > - else: > - license = recipe_license > - else: > - license = recipe_license > - spdx_license = return_spdx(d, dont_want_license) > - dont_want_licenses.append(spdx_license) > - > - def include_license(license): > - if any(fnmatch(license, pattern) for pattern in dont_want_licenses): > + license = d.getVar("LICENSE_%s-%s" % (pn, package), True) if package else None > + if not license: > + license = d.getVar('LICENSE', True) > + > + def license_ok(license): > + for dwl in dont_want_licenses: > + # If you want to exclude license named generically 'X', we > + # surely want to exclude 'X+' as well. In consequence, we > + # will exclude a trailing '+' character from LICENSE in > + # case INCOMPATIBLE_LICENSE is not a 'X+' license. > + lic = license > + if not re.search('\+$', dwl): > + lic = re.sub('\+', '', license) > + if fnmatch(lic, dwl): > return False > - else: > - return True > + return True > > - def choose_licenses(a, b): > - if all(include_license(lic) for lic in a): > - return a > - else: > - return b > + # Handles an "or" or two license sets provided by > + # flattened_licenses(), pick one that works if possible. > + def choose_lic_set(a, b): > + return a if all(license_ok(lic) for lic in a) else b > > - """ > - If you want to exlude license named generically 'X', we surely want to exlude 'X+' as well. > - In consequence, we will exclude the '+' character from LICENSE in case INCOMPATIBLE_LICENSE > - is not a 'X+' license. > - """ > - if not re.search(r'[+]',dont_want_license): > - licenses=oe.license.flattened_licenses(re.sub(r'[+]', '', license), choose_licenses) > - else: > - licenses=oe.license.flattened_licenses(license, choose_licenses) > - > - for onelicense in licenses: > - if not include_license(onelicense): > - return True > - return False > + licenses=oe.license.flattened_licenses(license, choose_lic_set) > + return any(not license_ok(l) for l in licenses) > > def check_license_flags(d): > """ > ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/1] base/license.bbclass: handle multiple INCOMPATIBLE_LICENSEs 2012-11-30 4:31 ` Saul Wold @ 2012-11-30 16:47 ` Andy Ross 2012-12-03 18:47 ` Saul Wold 0 siblings, 1 reply; 9+ messages in thread From: Andy Ross @ 2012-11-30 16:47 UTC (permalink / raw) To: Saul Wold; +Cc: openembedded-core On 11/29/2012 08:31 PM, Saul Wold wrote: > There still seems to be a problem with this patch, try building > core-image-minimal and core-image-basic, checkout the failure from > the autobuilder: > > http://autobuilder.yoctoproject.org:8010/builders/nightly-non-gpl3/builds/372/steps/shell_28/logs/stdio Oops, that was my goof. The nativesdk packages were being tested vs. INCOMPATIBLE_LICENSE because I incorrectly folded them in with the other types when refactoring; endswith/startswith, what's the difference? And of course I don't build nativesdk stuff routinely. Fixed: From 9796edb4e5a7a9a7c2d6d51fc68ea1ffa2b4d9ea Mon Sep 17 00:00:00 2001 From: Andy Ross <andy.ross@windriver.com> Date: Thu, 29 Nov 2012 11:08:47 -0800 Subject: [PATCH] base/license.bbclass: handle multiple INCOMPATIBLE_LICENSEs Allow INCOMPATIBLE_LICENSE to be a whitespace-separated list of incompatible license strings and/or glob patterns. Also fix wildcarding: the string in INCOMPATIBLE_LICENSE was clearly intended to match with wildcards (e.g. "*GPLv3" to match both GPLv3 and LGPLv3), but this was broken because of a bug in return_spdx() which would die with a runtime error when there was no SPDXLICENSEMAP entry for the string. Signed-off-by: Andy Ross <andy.ross@windriver.com> Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com> --- meta/classes/base.bbclass | 67 +++++++++++++++++++++---------------------- meta/classes/license.bbclass | 68 ++++++++++++++++---------------------------- 2 files changed, 58 insertions(+), 77 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 0ee9d2e..d01edb6 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -524,43 +524,42 @@ python () { raise bb.parse.SkipPackage("incompatible with machine %s (not in COMPATIBLE_MACHINE)" % this_machine) - 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") and not pn.endswith("-cross-canadian-%s" % d.getVar('TRANSLATED_TARGET_ARCH', True)) and not pn.startswith("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) - # 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 + bad_licenses = (d.getVar('INCOMPATIBLE_LICENSE', True) or "").split() + + check_license = False if pn.startswith("nativesdk-") else True + for t in ["-native", "-cross", "-cross-initial", "-cross-intermediate", "-crosssdk-intermediate", "-crosssdk", "-crosssdk-initial"]: + if pn.endswith(t): + check_license = False + + if check_license and bad_licenses: + whitelist = [] + for lic in bad_licenses: + for w in ["HOSTTOOLS_WHITELIST_", "LGPLv2_WHITELIST_", "WHITELIST_"]: + whitelist.extend((d.getVar(w + lic, True) or "").split()) + spdx_license = return_spdx(d, lic) + if spdx_license: + whitelist.extend((d.getVar('HOSTTOOLS_WHITELIST_%s' % spdx_license, True) or "").split()) + if not pn in whitelist: + recipe_license = d.getVar('LICENSE', True) + pkgs = d.getVar('PACKAGES', True).split() + skipped_pkgs = [] + unskipped_pkgs = [] + for pkg in pkgs: + if incompatible_license(d, bad_licenses, pkg): + skipped_pkgs.append(pkg) 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) + unskipped_pkgs.append(pkg) + some_skipped = skipped_pkgs and unskipped_pkgs + all_skipped = skipped_pkgs and not unskipped_pkgs + if some_skipped: + for pkg in skipped_pkgs: + bb.note("SKIPPING the package " + pkg + " at do_rootfs because it's " + recipe_license) d.setVar('LICENSE_EXCLUSION-' + pkg, 1) - for index, pkg in enumerate(unskipped_packages): + for pkg in unskipped_pkgs: 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) - - + elif all_skipped or incompatible_license(d, bad_licenses): + bb.note("SKIPPING recipe %s because it's %s" % (pn, recipe_license)) + raise bb.parse.SkipPackage("incompatible with license %s" % recipe_license) srcuri = d.getVar('SRC_URI', True) # Svn packages should DEPEND on subversion-native diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index c7ca4a6..7bca8e7 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -207,14 +207,11 @@ python do_populate_lic() { def return_spdx(d, license): """ - This function returns the spdx mapping of a license. - """ - if d.getVarFlag('SPDXLICENSEMAP', license) != None: - return license - else: - return d.getVarFlag('SPDXLICENSEMAP', license_type) + This function returns the spdx mapping of a license if it exists. + """ + return d.getVarFlag('SPDXLICENSEMAP', license, True) -def incompatible_license(d, dont_want_license, package=""): +def incompatible_license(d, dont_want_licenses, package=None): """ This function checks if a recipe has only incompatible licenses. It also take into consideration 'or' operand. @@ -223,45 +220,30 @@ def incompatible_license(d, dont_want_license, package=""): import oe.license from fnmatch import fnmatchcase as fnmatch pn = d.getVar('PN', True) - dont_want_licenses = [] - dont_want_licenses.append(d.getVar('INCOMPATIBLE_LICENSE', True)) - recipe_license = d.getVar('LICENSE', True) - if package != "": - if d.getVar('LICENSE_' + pn + '-' + package, True): - license = d.getVar('LICENSE_' + pn + '-' + package, True) - else: - license = recipe_license - else: - license = recipe_license - spdx_license = return_spdx(d, dont_want_license) - dont_want_licenses.append(spdx_license) - - def include_license(license): - if any(fnmatch(license, pattern) for pattern in dont_want_licenses): + license = d.getVar("LICENSE_%s-%s" % (pn, package), True) if package else None + if not license: + license = d.getVar('LICENSE', True) + + def license_ok(license): + for dwl in dont_want_licenses: + # If you want to exclude license named generically 'X', we + # surely want to exclude 'X+' as well. In consequence, we + # will exclude a trailing '+' character from LICENSE in + # case INCOMPATIBLE_LICENSE is not a 'X+' license. + lic = license + if not re.search('\+$', dwl): + lic = re.sub('\+', '', license) + if fnmatch(lic, dwl): return False - else: - return True + return True - def choose_licenses(a, b): - if all(include_license(lic) for lic in a): - return a - else: - return b + # Handles an "or" or two license sets provided by + # flattened_licenses(), pick one that works if possible. + def choose_lic_set(a, b): + return a if all(license_ok(lic) for lic in a) else b - """ - If you want to exlude license named generically 'X', we surely want to exlude 'X+' as well. - In consequence, we will exclude the '+' character from LICENSE in case INCOMPATIBLE_LICENSE - is not a 'X+' license. - """ - if not re.search(r'[+]',dont_want_license): - licenses=oe.license.flattened_licenses(re.sub(r'[+]', '', license), choose_licenses) - else: - licenses=oe.license.flattened_licenses(license, choose_licenses) - - for onelicense in licenses: - if not include_license(onelicense): - return True - return False + licenses=oe.license.flattened_licenses(license, choose_lic_set) + return any(not license_ok(l) for l in licenses) def check_license_flags(d): """ -- 1.7.11.7 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH 1/1] base/license.bbclass: handle multiple INCOMPATIBLE_LICENSEs 2012-11-30 16:47 ` Andy Ross @ 2012-12-03 18:47 ` Saul Wold 2012-12-03 18:54 ` Andy Ross 0 siblings, 1 reply; 9+ messages in thread From: Saul Wold @ 2012-12-03 18:47 UTC (permalink / raw) To: Andy Ross; +Cc: openembedded-core On 11/30/2012 08:47 AM, Andy Ross wrote: > On 11/29/2012 08:31 PM, Saul Wold wrote: >> There still seems to be a problem with this patch, try building >> core-image-minimal and core-image-basic, checkout the failure from >> the autobuilder: >> >> http://autobuilder.yoctoproject.org:8010/builders/nightly-non-gpl3/builds/372/steps/shell_28/logs/stdio >> > > Oops, that was my goof. The nativesdk packages were being tested > vs. INCOMPATIBLE_LICENSE because I incorrectly folded them in with the > other types when refactoring; endswith/startswith, what's the > difference? And of course I don't build nativesdk stuff routinely. > > Fixed: > I think this needs to be rebased since some other patches have been applied, please verify and rebase against master. Thanks Sau! > From 9796edb4e5a7a9a7c2d6d51fc68ea1ffa2b4d9ea Mon Sep 17 00:00:00 2001 > From: Andy Ross <andy.ross@windriver.com> > Date: Thu, 29 Nov 2012 11:08:47 -0800 > Subject: [PATCH] base/license.bbclass: handle multiple > INCOMPATIBLE_LICENSEs > > Allow INCOMPATIBLE_LICENSE to be a whitespace-separated list of > incompatible license strings and/or glob patterns. > > Also fix wildcarding: the string in INCOMPATIBLE_LICENSE was clearly > intended to match with wildcards (e.g. "*GPLv3" to match both GPLv3 > and LGPLv3), but this was broken because of a bug in return_spdx() > which would die with a runtime error when there was no SPDXLICENSEMAP > entry for the string. > > Signed-off-by: Andy Ross <andy.ross@windriver.com> > Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com> > --- > meta/classes/base.bbclass | 67 > +++++++++++++++++++++---------------------- > meta/classes/license.bbclass | 68 > ++++++++++++++++---------------------------- > 2 files changed, 58 insertions(+), 77 deletions(-) > > diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass > index 0ee9d2e..d01edb6 100644 > --- a/meta/classes/base.bbclass > +++ b/meta/classes/base.bbclass > @@ -524,43 +524,42 @@ python () { > raise bb.parse.SkipPackage("incompatible with > machine %s (not in COMPATIBLE_MACHINE)" % this_machine) > > > - 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") and not > pn.endswith("-cross-canadian-%s" % d.getVar('TRANSLATED_TARGET_ARCH', > True)) and not pn.startswith("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) > - # 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 > + bad_licenses = (d.getVar('INCOMPATIBLE_LICENSE', True) or > "").split() > + > + check_license = False if pn.startswith("nativesdk-") else True > + for t in ["-native", "-cross", "-cross-initial", > "-cross-intermediate", "-crosssdk-intermediate", "-crosssdk", > "-crosssdk-initial"]: > + if pn.endswith(t): > + check_license = False > + > + if check_license and bad_licenses: > + whitelist = [] > + for lic in bad_licenses: > + for w in ["HOSTTOOLS_WHITELIST_", "LGPLv2_WHITELIST_", > "WHITELIST_"]: > + whitelist.extend((d.getVar(w + lic, True) or > "").split()) > + spdx_license = return_spdx(d, lic) > + if spdx_license: > + whitelist.extend((d.getVar('HOSTTOOLS_WHITELIST_%s' > % spdx_license, True) or "").split()) > + if not pn in whitelist: > + recipe_license = d.getVar('LICENSE', True) > + pkgs = d.getVar('PACKAGES', True).split() > + skipped_pkgs = [] > + unskipped_pkgs = [] > + for pkg in pkgs: > + if incompatible_license(d, bad_licenses, pkg): > + skipped_pkgs.append(pkg) > 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) > + unskipped_pkgs.append(pkg) > + some_skipped = skipped_pkgs and unskipped_pkgs > + all_skipped = skipped_pkgs and not unskipped_pkgs > + if some_skipped: > + for pkg in skipped_pkgs: > + bb.note("SKIPPING the package " + pkg + " at > do_rootfs because it's " + recipe_license) > d.setVar('LICENSE_EXCLUSION-' + pkg, 1) > - for index, pkg in enumerate(unskipped_packages): > + for pkg in unskipped_pkgs: > 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) > - > - > + elif all_skipped or incompatible_license(d, bad_licenses): > + bb.note("SKIPPING recipe %s because it's %s" % (pn, > recipe_license)) > + raise bb.parse.SkipPackage("incompatible with > license %s" % recipe_license) > > srcuri = d.getVar('SRC_URI', True) > # Svn packages should DEPEND on subversion-native > diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass > index c7ca4a6..7bca8e7 100644 > --- a/meta/classes/license.bbclass > +++ b/meta/classes/license.bbclass > @@ -207,14 +207,11 @@ python do_populate_lic() { > > def return_spdx(d, license): > """ > - This function returns the spdx mapping of a license. > - """ > - if d.getVarFlag('SPDXLICENSEMAP', license) != None: > - return license > - else: > - return d.getVarFlag('SPDXLICENSEMAP', license_type) > + This function returns the spdx mapping of a license if it exists. > + """ > + return d.getVarFlag('SPDXLICENSEMAP', license, True) > > -def incompatible_license(d, dont_want_license, package=""): > +def incompatible_license(d, dont_want_licenses, package=None): > """ > This function checks if a recipe has only incompatible licenses. > It also take into consideration 'or' > operand. > @@ -223,45 +220,30 @@ def incompatible_license(d, dont_want_license, > package=""): > import oe.license > from fnmatch import fnmatchcase as fnmatch > pn = d.getVar('PN', True) > - dont_want_licenses = [] > - dont_want_licenses.append(d.getVar('INCOMPATIBLE_LICENSE', True)) > - recipe_license = d.getVar('LICENSE', True) > - if package != "": > - if d.getVar('LICENSE_' + pn + '-' + package, True): > - license = d.getVar('LICENSE_' + pn + '-' + package, True) > - else: > - license = recipe_license > - else: > - license = recipe_license > - spdx_license = return_spdx(d, dont_want_license) > - dont_want_licenses.append(spdx_license) > - > - def include_license(license): > - if any(fnmatch(license, pattern) for pattern in > dont_want_licenses): > + license = d.getVar("LICENSE_%s-%s" % (pn, package), True) if > package else None > + if not license: > + license = d.getVar('LICENSE', True) > + > + def license_ok(license): > + for dwl in dont_want_licenses: > + # If you want to exclude license named generically 'X', we > + # surely want to exclude 'X+' as well. In consequence, we > + # will exclude a trailing '+' character from LICENSE in > + # case INCOMPATIBLE_LICENSE is not a 'X+' license. > + lic = license > + if not re.search('\+$', dwl): > + lic = re.sub('\+', '', license) > + if fnmatch(lic, dwl): > return False > - else: > - return True > + return True > > - def choose_licenses(a, b): > - if all(include_license(lic) for lic in a): > - return a > - else: > - return b > + # Handles an "or" or two license sets provided by > + # flattened_licenses(), pick one that works if possible. > + def choose_lic_set(a, b): > + return a if all(license_ok(lic) for lic in a) else b > > - """ > - If you want to exlude license named generically 'X', we surely want > to exlude 'X+' as well. > - In consequence, we will exclude the '+' character from LICENSE in > case INCOMPATIBLE_LICENSE > - is not a 'X+' license. > - """ > - if not re.search(r'[+]',dont_want_license): > - licenses=oe.license.flattened_licenses(re.sub(r'[+]', '', > license), choose_licenses) > - else: > - licenses=oe.license.flattened_licenses(license, choose_licenses) > - > - for onelicense in licenses: > - if not include_license(onelicense): > - return True > - return False > + licenses=oe.license.flattened_licenses(license, choose_lic_set) > + return any(not license_ok(l) for l in licenses) > > def check_license_flags(d): > """ ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/1] base/license.bbclass: handle multiple INCOMPATIBLE_LICENSEs 2012-12-03 18:47 ` Saul Wold @ 2012-12-03 18:54 ` Andy Ross 0 siblings, 0 replies; 9+ messages in thread From: Andy Ross @ 2012-12-03 18:54 UTC (permalink / raw) To: Saul Wold; +Cc: openembedded-core On 12/03/2012 10:47 AM, Saul Wold wrote: > I think this needs to be rebased since some other patches have been applied, please verify and rebase against master. It applies cleanly for me on top of what seems to be the current oe-core HEAD: commit 24b954253dd1aa626835352c4dc8d085a19aae35 Author: Ross Burton <ross.burton@intel.com> Date: Wed Nov 28 15:28:48 2012 +0000 xserver-xorg: restore packaging for the DRI/DRI2/DBE extensions ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/1] base/license.bbclass: handle multiple INCOMPATIBLE_LICENSEs 2012-11-29 19:08 ` [PATCH 1/1] base/license.bbclass: handle multiple INCOMPATIBLE_LICENSEs Elizabeth Flanagan 2012-11-30 4:31 ` Saul Wold @ 2012-12-06 5:00 ` Saul Wold 2012-12-06 5:52 ` Andy Ross 1 sibling, 1 reply; 9+ messages in thread From: Saul Wold @ 2012-12-06 5:00 UTC (permalink / raw) To: Elizabeth Flanagan, Andy Ross; +Cc: openembedded-core On 11/29/2012 11:08 AM, Elizabeth Flanagan wrote: > From: Andy Ross <andy.ross@windriver.com> > > Allow INCOMPATIBLE_LICENSE to be a whitespace-separated list of > incompatible license strings and/or glob patterns. > > Also fix wildcarding: the string in INCOMPATIBLE_LICENSE was clearly > intended to match with wildcards (e.g. "*GPLv3" to match both GPLv3 > and LGPLv3), but this was broken because of a bug in return_spdx() > which would die with a runtime error when there was no SPDXLICENSEMAP > entry for the string. > Bad news! This patch is still having problems, see the Autobuilder recently build (link below). This is on MUT with the updated binutils, I am not sure if that is part of the problem or not, but binutils was working before. Partially it's failing with binutils-cross-canadian-<target arch> Dropping from mut for now, sorry. Sau! Failure Log: http://autobuilder.yoctoproject.org:8010/builders/nightly-non-gpl3/builds/380/steps/shell_29/logs/stdio > Signed-off-by: Andy Ross <andy.ross@windriver.com> > Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com> > --- > meta/classes/base.bbclass | 67 ++++++++++++++++++++-------------------- > meta/classes/license.bbclass | 70 ++++++++++++++++-------------------------- > 2 files changed, 59 insertions(+), 78 deletions(-) > > diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass > index 0ee9d2e..4fc0559 100644 > --- a/meta/classes/base.bbclass > +++ b/meta/classes/base.bbclass > @@ -524,43 +524,42 @@ python () { > raise bb.parse.SkipPackage("incompatible with machine %s (not in COMPATIBLE_MACHINE)" % this_machine) > > > - 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") and not pn.endswith("-cross-canadian-%s" % d.getVar('TRANSLATED_TARGET_ARCH', True)) and not pn.startswith("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) > - # 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 > + bad_licenses = (d.getVar('INCOMPATIBLE_LICENSE', True) or "").split() > + > + check_license = True > + for t in ["-native", "-cross", "-cross-initial", "-cross-intermediate", "-crosssdk-intermediate", "-crosssdk", "-crosssdk-initial", "-nativesdk"]: > + if pn.endswith(t): > + check_license = False > + > + if check_license and bad_licenses: > + whitelist = [] > + for lic in bad_licenses: > + for w in ["HOSTTOOLS_WHITELIST_", "LGPLv2_WHITELIST_", "WHITELIST_"]: > + whitelist.extend((d.getVar(w + lic, True) or "").split()) > + spdx_license = return_spdx(d, lic) > + if spdx_license: > + whitelist.extend((d.getVar('HOSTTOOLS_WHITELIST_%s' % spdx_license, True) or "").split()) > + if not pn in whitelist: > + recipe_license = d.getVar('LICENSE', True) > + pkgs = d.getVar('PACKAGES', True).split() > + skipped_pkgs = [] > + unskipped_pkgs = [] > + for pkg in pkgs: > + if incompatible_license(d, bad_licenses, pkg): > + skipped_pkgs.append(pkg) > 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) > + unskipped_pkgs.append(pkg) > + some_skipped = skipped_pkgs and unskipped_pkgs > + all_skipped = skipped_pkgs and not unskipped_pkgs > + if some_skipped: > + for pkg in skipped_pkgs: > + bb.note("SKIPPING the package " + pkg + " at do_rootfs because it's " + recipe_license) > d.setVar('LICENSE_EXCLUSION-' + pkg, 1) > - for index, pkg in enumerate(unskipped_packages): > + for pkg in unskipped_pkgs: > 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) > - > - > + elif all_skipped or incompatible_license(d, bad_licenses): > + bb.note("SKIPPING recipe %s because it's %s" % (pn, recipe_license)) > + raise bb.parse.SkipPackage("incompatible with license %s" % recipe_license) > > srcuri = d.getVar('SRC_URI', True) > # Svn packages should DEPEND on subversion-native > diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass > index c7ca4a6..9205cde 100644 > --- a/meta/classes/license.bbclass > +++ b/meta/classes/license.bbclass > @@ -207,14 +207,11 @@ python do_populate_lic() { > > def return_spdx(d, license): > """ > - This function returns the spdx mapping of a license. > - """ > - if d.getVarFlag('SPDXLICENSEMAP', license) != None: > - return license > - else: > - return d.getVarFlag('SPDXLICENSEMAP', license_type) > - > -def incompatible_license(d, dont_want_license, package=""): > + This function returns the spdx mapping of a license if it exists. > + """ > + return d.getVarFlag('SPDXLICENSEMAP', license, True) > + > +def incompatible_license(d, dont_want_licenses, package=None): > """ > This function checks if a recipe has only incompatible licenses. It also take into consideration 'or' > operand. > @@ -223,45 +220,30 @@ def incompatible_license(d, dont_want_license, package=""): > import oe.license > from fnmatch import fnmatchcase as fnmatch > pn = d.getVar('PN', True) > - dont_want_licenses = [] > - dont_want_licenses.append(d.getVar('INCOMPATIBLE_LICENSE', True)) > - recipe_license = d.getVar('LICENSE', True) > - if package != "": > - if d.getVar('LICENSE_' + pn + '-' + package, True): > - license = d.getVar('LICENSE_' + pn + '-' + package, True) > - else: > - license = recipe_license > - else: > - license = recipe_license > - spdx_license = return_spdx(d, dont_want_license) > - dont_want_licenses.append(spdx_license) > - > - def include_license(license): > - if any(fnmatch(license, pattern) for pattern in dont_want_licenses): > + license = d.getVar("LICENSE_%s-%s" % (pn, package), True) if package else None > + if not license: > + license = d.getVar('LICENSE', True) > + > + def license_ok(license): > + for dwl in dont_want_licenses: > + # If you want to exclude license named generically 'X', we > + # surely want to exclude 'X+' as well. In consequence, we > + # will exclude a trailing '+' character from LICENSE in > + # case INCOMPATIBLE_LICENSE is not a 'X+' license. > + lic = license > + if not re.search('\+$', dwl): > + lic = re.sub('\+', '', license) > + if fnmatch(lic, dwl): > return False > - else: > - return True > + return True > > - def choose_licenses(a, b): > - if all(include_license(lic) for lic in a): > - return a > - else: > - return b > + # Handles an "or" or two license sets provided by > + # flattened_licenses(), pick one that works if possible. > + def choose_lic_set(a, b): > + return a if all(license_ok(lic) for lic in a) else b > > - """ > - If you want to exlude license named generically 'X', we surely want to exlude 'X+' as well. > - In consequence, we will exclude the '+' character from LICENSE in case INCOMPATIBLE_LICENSE > - is not a 'X+' license. > - """ > - if not re.search(r'[+]',dont_want_license): > - licenses=oe.license.flattened_licenses(re.sub(r'[+]', '', license), choose_licenses) > - else: > - licenses=oe.license.flattened_licenses(license, choose_licenses) > - > - for onelicense in licenses: > - if not include_license(onelicense): > - return True > - return False > + licenses=oe.license.flattened_licenses(license, choose_lic_set) > + return any(not license_ok(l) for l in licenses) > > def check_license_flags(d): > """ > ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/1] base/license.bbclass: handle multiple INCOMPATIBLE_LICENSEs 2012-12-06 5:00 ` Saul Wold @ 2012-12-06 5:52 ` Andy Ross 2012-12-06 18:41 ` Andy Ross 0 siblings, 1 reply; 9+ messages in thread From: Andy Ross @ 2012-12-06 5:52 UTC (permalink / raw) To: Saul Wold; +Cc: openembedded-core On 12/05/2012 09:00 PM, Saul Wold wrote: > This patch is still having problems, see the Autobuilder recently build (link below). This is on MUT with the updated binutils, I am not sure if that is part of the problem or not, but binutils was working before. Ah, fun fun. It's not binutils. Something (I'm not sure what -- is "yocto-autobuild" a recipe?) is pulling in the cross-canadian toolchain, and I had missed the appended architecture in the license.bbclass test. I'll get you a fixed and tested patch tomorrow morning. But there's a serious question here: *should* this have worked? The toolchain is GPLv3, and a canadian cross toolchain is presumably intended to be distributed (because by defintion, it doesn't run on the local machine), no? Andy ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH 1/1] base/license.bbclass: handle multiple INCOMPATIBLE_LICENSEs 2012-12-06 5:52 ` Andy Ross @ 2012-12-06 18:41 ` Andy Ross 0 siblings, 0 replies; 9+ messages in thread From: Andy Ross @ 2012-12-06 18:41 UTC (permalink / raw) To: Saul Wold; +Cc: openembedded-core On 12/05/2012 09:52 PM, Andy Ross wrote: > On 12/05/2012 09:00 PM, Saul Wold wrote: >> This patch is still having problems, see the Autobuilder recently build (link below). This is on MUT with the updated binutils, I am not sure if that is part of the problem or not, but binutils was working before. > > Ah, fun fun. It's not binutils. Something (I'm not sure what -- is > "yocto-autobuild" a recipe?) is pulling in the cross-canadian > toolchain, and I had missed the appended architecture in the > license.bbclass test. I'll get you a fixed and tested patch tomorrow > morning. Take 3: From 2eda90739df7b2b474ef79e00563e190272051a3 Mon Sep 17 00:00:00 2001 From: Andy Ross <andy.ross@windriver.com> Date: Thu, 29 Nov 2012 11:08:47 -0800 Subject: [PATCH] base/license.bbclass: handle multiple INCOMPATIBLE_LICENSEs Allow INCOMPATIBLE_LICENSE to be a whitespace-separated list of incompatible license strings and/or glob patterns. Also fix wildcarding: the string in INCOMPATIBLE_LICENSE was clearly intended to match with wildcards (e.g. "*GPLv3" to match both GPLv3 and LGPLv3), but this was broken because of a bug in return_spdx() which would die with a runtime error when there was no SPDXLICENSEMAP entry for the string. Signed-off-by: Andy Ross <andy.ross@windriver.com> Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com> --- meta/classes/base.bbclass | 69 ++++++++++++++++++++++---------------------- meta/classes/license.bbclass | 68 ++++++++++++++++--------------------------- 2 files changed, 60 insertions(+), 77 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 0ee9d2e..43794af 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -524,43 +524,44 @@ python () { raise bb.parse.SkipPackage("incompatible with machine %s (not in COMPATIBLE_MACHINE)" % this_machine) - 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") and not pn.endswith("-cross-canadian-%s" % d.getVar('TRANSLATED_TARGET_ARCH', True)) and not pn.startswith("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) - # 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 + bad_licenses = (d.getVar('INCOMPATIBLE_LICENSE', True) or "").split() + + check_license = False if pn.startswith("nativesdk-") else True + for t in ["-native", "-cross", "-cross-initial", "-cross-intermediate", + "-crosssdk-intermediate", "-crosssdk", "-crosssdk-initial", + "-cross-canadian-" + d.getVar('TRANSLATED_TARGET_ARCH', True)]: + if pn.endswith(t): + check_license = False + + if check_license and bad_licenses: + whitelist = [] + for lic in bad_licenses: + for w in ["HOSTTOOLS_WHITELIST_", "LGPLv2_WHITELIST_", "WHITELIST_"]: + whitelist.extend((d.getVar(w + lic, True) or "").split()) + spdx_license = return_spdx(d, lic) + if spdx_license: + whitelist.extend((d.getVar('HOSTTOOLS_WHITELIST_%s' % spdx_license, True) or "").split()) + if not pn in whitelist: + recipe_license = d.getVar('LICENSE', True) + pkgs = d.getVar('PACKAGES', True).split() + skipped_pkgs = [] + unskipped_pkgs = [] + for pkg in pkgs: + if incompatible_license(d, bad_licenses, pkg): + skipped_pkgs.append(pkg) 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) + unskipped_pkgs.append(pkg) + some_skipped = skipped_pkgs and unskipped_pkgs + all_skipped = skipped_pkgs and not unskipped_pkgs + if some_skipped: + for pkg in skipped_pkgs: + bb.note("SKIPPING the package " + pkg + " at do_rootfs because it's " + recipe_license) d.setVar('LICENSE_EXCLUSION-' + pkg, 1) - for index, pkg in enumerate(unskipped_packages): + for pkg in unskipped_pkgs: 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) - - + elif all_skipped or incompatible_license(d, bad_licenses): + bb.note("SKIPPING recipe %s because it's %s" % (pn, recipe_license)) + raise bb.parse.SkipPackage("incompatible with license %s" % recipe_license) srcuri = d.getVar('SRC_URI', True) # Svn packages should DEPEND on subversion-native diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 66cde1c..7783820 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -208,14 +208,11 @@ python do_populate_lic() { def return_spdx(d, license): """ - This function returns the spdx mapping of a license. - """ - if d.getVarFlag('SPDXLICENSEMAP', license) != None: - return license - else: - return d.getVarFlag('SPDXLICENSEMAP', license_type) + This function returns the spdx mapping of a license if it exists. + """ + return d.getVarFlag('SPDXLICENSEMAP', license, True) -def incompatible_license(d, dont_want_license, package=""): +def incompatible_license(d, dont_want_licenses, package=None): """ This function checks if a recipe has only incompatible licenses. It also take into consideration 'or' operand. @@ -224,45 +221,30 @@ def incompatible_license(d, dont_want_license, package=""): import oe.license from fnmatch import fnmatchcase as fnmatch pn = d.getVar('PN', True) - dont_want_licenses = [] - dont_want_licenses.append(d.getVar('INCOMPATIBLE_LICENSE', True)) - recipe_license = d.getVar('LICENSE', True) - if package != "": - if d.getVar('LICENSE_' + pn + '-' + package, True): - license = d.getVar('LICENSE_' + pn + '-' + package, True) - else: - license = recipe_license - else: - license = recipe_license - spdx_license = return_spdx(d, dont_want_license) - dont_want_licenses.append(spdx_license) - - def include_license(license): - if any(fnmatch(license, pattern) for pattern in dont_want_licenses): + license = d.getVar("LICENSE_%s-%s" % (pn, package), True) if package else None + if not license: + license = d.getVar('LICENSE', True) + + def license_ok(license): + for dwl in dont_want_licenses: + # If you want to exclude license named generically 'X', we + # surely want to exclude 'X+' as well. In consequence, we + # will exclude a trailing '+' character from LICENSE in + # case INCOMPATIBLE_LICENSE is not a 'X+' license. + lic = license + if not re.search('\+$', dwl): + lic = re.sub('\+', '', license) + if fnmatch(lic, dwl): return False - else: - return True + return True - def choose_licenses(a, b): - if all(include_license(lic) for lic in a): - return a - else: - return b + # Handles an "or" or two license sets provided by + # flattened_licenses(), pick one that works if possible. + def choose_lic_set(a, b): + return a if all(license_ok(lic) for lic in a) else b - """ - If you want to exlude license named generically 'X', we surely want to exlude 'X+' as well. - In consequence, we will exclude the '+' character from LICENSE in case INCOMPATIBLE_LICENSE - is not a 'X+' license. - """ - if not re.search(r'[+]',dont_want_license): - licenses=oe.license.flattened_licenses(re.sub(r'[+]', '', license), choose_licenses) - else: - licenses=oe.license.flattened_licenses(license, choose_licenses) - - for onelicense in licenses: - if not include_license(onelicense): - return True - return False + licenses=oe.license.flattened_licenses(license, choose_lic_set) + return any(not license_ok(l) for l in licenses) def check_license_flags(d): """ -- 1.7.11.7 ^ permalink raw reply related [flat|nested] 9+ messages in thread
end of thread, other threads:[~2012-12-06 18:55 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-11-29 19:08 [PATCH 0/1] base/license: Incompatible License fixes Elizabeth Flanagan 2012-11-29 19:08 ` [PATCH 1/1] base/license.bbclass: handle multiple INCOMPATIBLE_LICENSEs Elizabeth Flanagan 2012-11-30 4:31 ` Saul Wold 2012-11-30 16:47 ` Andy Ross 2012-12-03 18:47 ` Saul Wold 2012-12-03 18:54 ` Andy Ross 2012-12-06 5:00 ` Saul Wold 2012-12-06 5:52 ` Andy Ross 2012-12-06 18:41 ` Andy Ross
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.