diff options
author | Mariano Lopez <mariano.lopez@linux.intel.com> | 2015-06-09 12:46:48 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-06-23 11:46:57 +0100 |
commit | ae9102bda398359736ae0d46db388af51141d361 (patch) | |
tree | bb3f0b993299690b57d76b0c78df171c1002917f /meta/classes/archiver.bbclass | |
parent | b4c5f802e30b175afc0d1d7225ae939113b61cdf (diff) | |
download | poky-ae9102bda398359736ae0d46db388af51141d361.tar.gz |
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>
Diffstat (limited to 'meta/classes/archiver.bbclass')
-rw-r--r-- | meta/classes/archiver.bbclass | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index b598aa3ad6..7b5274df89 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass | |||
@@ -52,14 +52,12 @@ do_ar_original[dirs] = "${ARCHIVER_OUTDIR} ${ARCHIVER_WORKDIR}" | |||
52 | python () { | 52 | python () { |
53 | pn = d.getVar('PN', True) | 53 | pn = d.getVar('PN', True) |
54 | 54 | ||
55 | if d.getVar('COPYLEFT_LICENSE_INCLUDE', True) or \ | 55 | included, reason = copyleft_should_include(d) |
56 | d.getVar('COPYLEFT_LICENSE_EXCLUDE', True): | 56 | if not included: |
57 | included, reason = copyleft_should_include(d) | 57 | bb.debug(1, 'archiver: %s is excluded: %s' % (pn, reason)) |
58 | if not included: | 58 | return |
59 | bb.debug(1, 'archiver: %s is excluded: %s' % (pn, reason)) | 59 | else: |
60 | return | 60 | bb.debug(1, 'archiver: %s is included: %s' % (pn, reason)) |
61 | else: | ||
62 | bb.debug(1, 'archiver: %s is included: %s' % (pn, reason)) | ||
63 | 61 | ||
64 | ar_src = d.getVarFlag('ARCHIVER_MODE', 'src', True) | 62 | ar_src = d.getVarFlag('ARCHIVER_MODE', 'src', True) |
65 | ar_dumpdata = d.getVarFlag('ARCHIVER_MODE', 'dumpdata', True) | 63 | ar_dumpdata = d.getVarFlag('ARCHIVER_MODE', 'dumpdata', True) |