From 3e40711c8b60fe215dda998e765cf5b9e33060d6 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Thu, 23 Aug 2012 14:08:09 +0800 Subject: [PATCH] copyleft_compliance.bbclass: remove the duplicated code A part of the code in copyleft_compliance.bbclass is duplicated to archiver.bbclass, remove the duplicated lines. [YOCTO #2619] (From OE-Core rev: 731e1171d6c35ed086b36c081f48dba2015319f8) Signed-off-by: Robert Yang Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/classes/copyleft_compliance.bbclass | 51 ++------------------------------ 1 file changed, 3 insertions(+), 48 deletions(-) diff --git a/meta/classes/copyleft_compliance.bbclass b/meta/classes/copyleft_compliance.bbclass index c59cb7a..e68942d 100644 --- a/meta/classes/copyleft_compliance.bbclass +++ b/meta/classes/copyleft_compliance.bbclass @@ -6,55 +6,10 @@ # # vi:sts=4:sw=4:et -COPYLEFT_SOURCES_DIR ?= '${DEPLOY_DIR}/copyleft_sources' - -COPYLEFT_LICENSE_INCLUDE ?= 'GPL* LGPL*' -COPYLEFT_LICENSE_INCLUDE[type] = 'list' -COPYLEFT_LICENSE_INCLUDE[doc] = 'Space separated list of globs which include licenses' - -COPYLEFT_LICENSE_EXCLUDE ?= 'CLOSED Proprietary' -COPYLEFT_LICENSE_EXCLUDE[type] = 'list' -COPYLEFT_LICENSE_INCLUDE[doc] = 'Space separated list of globs which exclude licenses' - -COPYLEFT_RECIPE_TYPE ?= '${@copyleft_recipe_type(d)}' -COPYLEFT_RECIPE_TYPE[doc] = 'The "type" of the current recipe (e.g. target, native, cross)' - -COPYLEFT_RECIPE_TYPES ?= 'target' -COPYLEFT_RECIPE_TYPES[type] = 'list' -COPYLEFT_RECIPE_TYPES[doc] = 'Space separated list of recipe types to include' - -COPYLEFT_AVAILABLE_RECIPE_TYPES = 'target native nativesdk cross crosssdk cross-canadian' -COPYLEFT_AVAILABLE_RECIPE_TYPES[type] = 'list' -COPYLEFT_AVAILABLE_RECIPE_TYPES[doc] = 'Space separated list of available recipe types' - -def copyleft_recipe_type(d): - for recipe_type in oe.data.typed_value('COPYLEFT_AVAILABLE_RECIPE_TYPES', d): - if oe.utils.inherits(d, recipe_type): - return recipe_type - return 'target' +# Need the copyleft_should_include +inherit archiver -def copyleft_should_include(d): - """Determine if this recipe's sources should be deployed for compliance""" - import ast - import oe.license - from fnmatch import fnmatchcase as fnmatch - - recipe_type = d.getVar('COPYLEFT_RECIPE_TYPE', True) - if recipe_type not in oe.data.typed_value('COPYLEFT_RECIPE_TYPES', d): - return False, 'recipe type "%s" is excluded' % recipe_type - - include = oe.data.typed_value('COPYLEFT_LICENSE_INCLUDE', d) - exclude = oe.data.typed_value('COPYLEFT_LICENSE_EXCLUDE', d) - - try: - is_included, reason = oe.license.is_included(d.getVar('LICENSE', True), include, exclude) - except oe.license.LicenseError as exc: - bb.fatal('%s: %s' % (d.getVar('PF', True), exc)) - else: - if is_included: - return True, 'recipe has included licenses: %s' % ', '.join(reason) - else: - return False, 'recipe has excluded licenses: %s' % ', '.join(reason) +COPYLEFT_SOURCES_DIR ?= '${DEPLOY_DIR}/copyleft_sources' python do_prepare_copyleft_sources () { """Populate a tree of the recipe sources and emit patch series files""" -- 2.7.4