From 04066239e9cd6a8461fb2c18e826289469ac1240 Mon Sep 17 00:00:00 2001 From: Mariano Lopez Date: Tue, 9 Jun 2015 12:46:48 +0000 Subject: 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] Signed-off-by: Mariano Lopez Signed-off-by: Ross Burton --- meta/classes/archiver.bbclass | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'meta/classes/archiver.bbclass') 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}" 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) -- cgit 1.2.3-korg