copyleft_filter.bbclass: Allow to filter on name

PATCH In review [email protected] 2 participants 3 messages Jun 9, 2015 – Jun 18, 2015 1 message not in the archive

lore

Share & tools

lore

[email protected]

author

2015-06-09 20:53 UTC #1 lore raw

PATCH 1/1 copyleft_filter.bbclass: Allow to filter on name

In reply to a message not in the archive

From: Mariano Lopez <[email protected]>

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]

Signed-off-by Mariano Lopez <[email protected]>

---
 meta/classes/archiver.bbclass        | 14 ++++++--------
 meta/classes/copyleft_filter.bbclass | 25 +++++++++++++++++++++----
 2 files changed, 27 insertions(+), 12 deletions(-)

meta/classes/archiver.bbclass +6 -8

index b598aa3..7b5274d 100644
@@ -52,14 +52,12 @@ do_ar_original[dirs] = "${ARCHIVER_OUTDIR} ${ARCHIVER_WORKDIR}"
 python () {
     pn = d.getVar('PN', True)
 
-    if d.getVar('COPYLEFT_LICENSE_INCLUDE', True) or \
-            d.getVar('COPYLEFT_LICENSE_EXCLUDE', True):
-        included, reason = copyleft_should_include(d)
-        if not included:
-            bb.debug(1, 'archiver: %s is excluded: %s' % (pn, reason))
-            return
-        else:
-            bb.debug(1, 'archiver: %s is included: %s' % (pn, reason))
+    included, reason = copyleft_should_include(d)
+    if not included:
+        bb.debug(1, 'archiver: %s is excluded: %s' % (pn, reason))
+        return
+    else:
+        bb.debug(1, 'archiver: %s is included: %s' % (pn, reason))
 
     ar_src = d.getVarFlag('ARCHIVER_MODE', 'src', True)
     ar_dumpdata = d.getVarFlag('ARCHIVER_MODE', 'dumpdata', True)

meta/classes/copyleft_filter.bbclass +21 -4

index 2c1d8f1..46be7f7 100644
@@ -25,6 +25,14 @@ COPYLEFT_AVAILABLE_RECIPE_TYPES = 'target native nativesdk cross crosssdk cross-
 COPYLEFT_AVAILABLE_RECIPE_TYPES[type] = 'list'
 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):
     for recipe_type in oe.data.typed_value('COPYLEFT_AVAILABLE_RECIPE_TYPES', d):
         if oe.utils.inherits(d, recipe_type):

@@ -39,9 +47,11 @@ def copyleft_should_include(d):
     import oe.license
     from fnmatch import fnmatchcase as fnmatch
 
+    included, motive = False, 'recipe did not match anything'
+
     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, motive = 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)

@@ -53,10 +63,17 @@ def copyleft_should_include(d):
     else:
         if is_included:
             if reason:
-                return True, 'recipe has included licenses: %s' % ', '.join(reason)
+                included, motive = True, 'recipe has included licenses: %s' % ', '.join(reason)
             else:
-                return False, 'recipe does not include a copyleft license'
+                included, motive = False, 'recipe does not include a copyleft license'
         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

Signature · 1 line

1.8.4.5

Paul Eggleton

Acked-by on v1 1/1

2015-06-15 15:27 UTC #2 lore raw

Quoted 91 lines · On Tuesday 09 June 2015 12:46:48 [email protected] wrote:

From: Mariano Lopez <[email protected]>
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]
Signed-off-by Mariano Lopez <[email protected]>
---
 meta/classes/archiver.bbclass        | 14 ++++++--------
 meta/classes/copyleft_filter.bbclass | 25 +++++++++++++++++++++----
 2 files changed, 27 insertions(+), 12 deletions(-)
meta/classes/archiver.bbclass +6 -8
index b598aa3..7b5274d 100644
@@ -52,14 +52,12 @@ do_ar_original[dirs] = "${ARCHIVER_OUTDIR}
 ${ARCHIVER_WORKDIR}" python () {
     pn = d.getVar('PN', True)
 
-    if d.getVar('COPYLEFT_LICENSE_INCLUDE', True) or \
-            d.getVar('COPYLEFT_LICENSE_EXCLUDE', True):
-        included, reason = copyleft_should_include(d)
-        if not included:
-            bb.debug(1, 'archiver: %s is excluded: %s' % (pn, reason))
-            return
-        else:
-            bb.debug(1, 'archiver: %s is included: %s' % (pn, reason))
+    included, reason = copyleft_should_include(d)
+    if not included:
+        bb.debug(1, 'archiver: %s is excluded: %s' % (pn, reason))
+        return
+    else:
+        bb.debug(1, 'archiver: %s is included: %s' % (pn, reason))
 
     ar_src = d.getVarFlag('ARCHIVER_MODE', 'src', True)
     ar_dumpdata = d.getVarFlag('ARCHIVER_MODE', 'dumpdata', True)
(quoted diff) +0 -0
b/meta/classes/copyleft_filter.bbclass index 2c1d8f1..46be7f7 100644
meta/classes/copyleft_filter.bbclass +0 -0
@@ -25,6 +25,14 @@ COPYLEFT_AVAILABLE_RECIPE_TYPES = 'target native
nativesdk cross crosssdk cross- COPYLEFT_AVAILABLE_RECIPE_TYPES[type] = 'list'
COPYLEFT_AVAILABLE_RECIPE_TYPES[doc] = 'Space separated list of available
recipe types'
meta/classes/copyleft_filter.bbclass +3 -0
+COPYLEFT_PN_INCLUDE ?= ''
+COPYLEFT_PN_INCLUDE[type] = 'list'
+COPYLEFT_PN_INCLUDE[doc] = 'Space separated list of recipe names to
include' +
meta/classes/copyleft_filter.bbclass +3 -0
+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):
for recipe_type in
oe.data.typed_value('COPYLEFT_AVAILABLE_RECIPE_TYPES', d): if oe.utils.inherits(d, recipe_type):
meta/classes/copyleft_filter.bbclass +3 -1
@@ -39,9 +47,11 @@ def copyleft_should_include(d):
     import oe.license
     from fnmatch import fnmatchcase as fnmatch
 
+    included, motive = False, 'recipe did not match anything'
+
     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, motive = 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)
meta/classes/copyleft_filter.bbclass +0 -1
@@ -53,10 +63,17 @@ def copyleft_should_include(d):
     else:
         if is_included:
             if reason:
-                return True, 'recipe has included licenses: %s' % ',
'.join(reason) + included, motive = True, 'recipe has
included licenses: %s' % ', '.join(reason) else:
meta/classes/copyleft_filter.bbclass +1 -1
-                return False, 'recipe does not include a copyleft license'
+                included, motive = False, 'recipe does not include a
copyleft license' else:
- return False, 'recipe has excluded licenses: %s' % ',
'.join(reason) + included, motive = False, 'recipe has excluded
licenses: %s' % ', '.join(reason)

meta/classes/copyleft_filter.bbclass def copyleft_should_include(d): · line 79

Quoted 8 lines

meta/classes/copyleft_filter.bbclass +7 -0

+    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

Changes look good.

Acked-by Paul Eggleton <[email protected]>

Signature · 2 lines

Paul Eggleton
Intel Open Source Technology Centre

Mariano Lopez

author

2015-06-18 19:26 UTC #3 lore raw

In reply to [email protected]

ping

Quoted 93 lines · On 06/09/2015 07:46 AM, [email protected] wrote: