copyleft_filter.bbclass: Allow to filter on name
The archiver uses a license based filter to provide the source code. This patch allows to search on name based on two new variables (COPYLEFT_PN_INCLUDE, COPYLEFT_PN_EXCLUDE). Both variables are empty by default. The filter by name has higher priority than the license filter. [YOCTO # 6929] (From OE-Core rev: 04066239e9cd6a8461fb2c18e826289469ac1240) Signed-off-by: Mariano Lopez <mariano.lopez@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
b4c5f802e3
commit
ae9102bda3
|
@ -52,14 +52,12 @@ do_ar_original[dirs] = "${ARCHIVER_OUTDIR} ${ARCHIVER_WORKDIR}"
|
||||||
python () {
|
python () {
|
||||||
pn = d.getVar('PN', True)
|
pn = d.getVar('PN', True)
|
||||||
|
|
||||||
if d.getVar('COPYLEFT_LICENSE_INCLUDE', True) or \
|
included, reason = copyleft_should_include(d)
|
||||||
d.getVar('COPYLEFT_LICENSE_EXCLUDE', True):
|
if not included:
|
||||||
included, reason = copyleft_should_include(d)
|
bb.debug(1, 'archiver: %s is excluded: %s' % (pn, reason))
|
||||||
if not included:
|
return
|
||||||
bb.debug(1, 'archiver: %s is excluded: %s' % (pn, reason))
|
else:
|
||||||
return
|
bb.debug(1, 'archiver: %s is included: %s' % (pn, reason))
|
||||||
else:
|
|
||||||
bb.debug(1, 'archiver: %s is included: %s' % (pn, reason))
|
|
||||||
|
|
||||||
ar_src = d.getVarFlag('ARCHIVER_MODE', 'src', True)
|
ar_src = d.getVarFlag('ARCHIVER_MODE', 'src', True)
|
||||||
ar_dumpdata = d.getVarFlag('ARCHIVER_MODE', 'dumpdata', True)
|
ar_dumpdata = d.getVarFlag('ARCHIVER_MODE', 'dumpdata', True)
|
||||||
|
|
|
@ -25,6 +25,14 @@ COPYLEFT_AVAILABLE_RECIPE_TYPES = 'target native nativesdk cross crosssdk cross-
|
||||||
COPYLEFT_AVAILABLE_RECIPE_TYPES[type] = 'list'
|
COPYLEFT_AVAILABLE_RECIPE_TYPES[type] = 'list'
|
||||||
COPYLEFT_AVAILABLE_RECIPE_TYPES[doc] = 'Space separated list of available recipe types'
|
COPYLEFT_AVAILABLE_RECIPE_TYPES[doc] = 'Space separated list of available recipe types'
|
||||||
|
|
||||||
|
COPYLEFT_PN_INCLUDE ?= ''
|
||||||
|
COPYLEFT_PN_INCLUDE[type] = 'list'
|
||||||
|
COPYLEFT_PN_INCLUDE[doc] = 'Space separated list of recipe names to include'
|
||||||
|
|
||||||
|
COPYLEFT_PN_EXCLUDE ?= ''
|
||||||
|
COPYLEFT_PN_EXCLUDE[type] = 'list'
|
||||||
|
COPYLEFT_PN_EXCLUDE[doc] = 'Space separated list of recipe names to exclude'
|
||||||
|
|
||||||
def copyleft_recipe_type(d):
|
def copyleft_recipe_type(d):
|
||||||
for recipe_type in oe.data.typed_value('COPYLEFT_AVAILABLE_RECIPE_TYPES', d):
|
for recipe_type in oe.data.typed_value('COPYLEFT_AVAILABLE_RECIPE_TYPES', d):
|
||||||
if oe.utils.inherits(d, recipe_type):
|
if oe.utils.inherits(d, recipe_type):
|
||||||
|
@ -39,9 +47,11 @@ def copyleft_should_include(d):
|
||||||
import oe.license
|
import oe.license
|
||||||
from fnmatch import fnmatchcase as fnmatch
|
from fnmatch import fnmatchcase as fnmatch
|
||||||
|
|
||||||
|
included, motive = False, 'recipe did not match anything'
|
||||||
|
|
||||||
recipe_type = d.getVar('COPYLEFT_RECIPE_TYPE', True)
|
recipe_type = d.getVar('COPYLEFT_RECIPE_TYPE', True)
|
||||||
if recipe_type not in oe.data.typed_value('COPYLEFT_RECIPE_TYPES', d):
|
if recipe_type not in oe.data.typed_value('COPYLEFT_RECIPE_TYPES', d):
|
||||||
return False, 'recipe type "%s" is excluded' % recipe_type
|
include, motive = False, 'recipe type "%s" is excluded' % recipe_type
|
||||||
|
|
||||||
include = oe.data.typed_value('COPYLEFT_LICENSE_INCLUDE', d)
|
include = oe.data.typed_value('COPYLEFT_LICENSE_INCLUDE', d)
|
||||||
exclude = oe.data.typed_value('COPYLEFT_LICENSE_EXCLUDE', d)
|
exclude = oe.data.typed_value('COPYLEFT_LICENSE_EXCLUDE', d)
|
||||||
|
@ -53,10 +63,17 @@ def copyleft_should_include(d):
|
||||||
else:
|
else:
|
||||||
if is_included:
|
if is_included:
|
||||||
if reason:
|
if reason:
|
||||||
return True, 'recipe has included licenses: %s' % ', '.join(reason)
|
included, motive = True, 'recipe has included licenses: %s' % ', '.join(reason)
|
||||||
else:
|
else:
|
||||||
return False, 'recipe does not include a copyleft license'
|
included, motive = False, 'recipe does not include a copyleft license'
|
||||||
else:
|
else:
|
||||||
return False, 'recipe has excluded licenses: %s' % ', '.join(reason)
|
included, motive = False, 'recipe has excluded licenses: %s' % ', '.join(reason)
|
||||||
|
|
||||||
|
if any(fnmatch(d.getVar('PN', True), name) \
|
||||||
|
for name in oe.data.typed_value('COPYLEFT_PN_INCLUDE', d)):
|
||||||
|
included, motive = True, 'recipe included by name'
|
||||||
|
if any(fnmatch(d.getVar('PN', True), name) \
|
||||||
|
for name in oe.data.typed_value('COPYLEFT_PN_EXCLUDE', d)):
|
||||||
|
included, motive = False, 'recipe excluded by name'
|
||||||
|
|
||||||
|
return included, motive
|
||||||
|
|
Loading…
Reference in New Issue