Return-Path: Received: from smtp2.axis.com (smtp2.axis.com [195.60.68.18]) by mail.openembedded.org (Postfix) with ESMTP id 2B2977FC86 for ; Wed, 11 Dec 2019 03:11:32 +0000 (UTC) IronPort-SDR: AZIC+41wy8GVmvF8vU9QO1M5DocXv+mqJatcFL0SaRyuSCWdEVnNtYjJuvYona+c0SnFDJzQmA 3URxrFARP9YGe9RlmqC0ESWxt9KdqOiy/Smc+ENt6ImlX/6lPoWI1YdJb/P/90VNFuDd9/HSQT zjE6OszqL2bH6Y9/dsmPaNH0npxaZwWEXoVKu0yJiFc++tm0MB0YJi22Et122GcM895ApsaH2X LTpLE7GNhrVlZV9ITLN1fyhcQMdNW53ZRgKo9A0A64FR3iE/Dpu73/ewI4pWfdx28PzAAvLXc1 mHY= X-IronPort-AV: E=Sophos;i="5.69,301,1571695200"; d="scan'208";a="3360221" X-Axis-User: NO X-Axis-NonUser: YES X-Virus-Scanned: Debian amavisd-new at bastet.se.axis.com From: Peter Kjellerstedt To: openembedded-core@lists.openembedded.org Date: Wed, 11 Dec 2019 04:11:22 +0100 Message-Id: <20191211031126.22782-4-pkj@axis.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191211031126.22782-1-pkj@axis.com> References: <20191211031126.22782-1-pkj@axis.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 Subject: [PATCHv2 4/8] base.bbclass: Simplify the check for whitelisted licenses X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 11 Dec 2019 03:11:33 -0000 Content-Transfer-Encoding: 8bit After a number of rewrites, the code checking if a package has been whitelisted for an incompatible license was calculating the whitelisted packages twice (as 'whitelist' and as 'incompatwl'). Signed-off-by: Peter Kjellerstedt --- meta/classes/base.bbclass | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 31457f9f12..a3170d219c 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -526,23 +526,21 @@ python () { bad_licenses = expand_wildcard_licenses(d, bad_licenses) whitelist = [] - incompatwl = [] for lic in bad_licenses: spdx_license = return_spdx(d, lic) whitelist.extend((d.getVar("WHITELIST_" + lic) or "").split()) if spdx_license: whitelist.extend((d.getVar("WHITELIST_" + spdx_license) or "").split()) + + if pn in whitelist: ''' We need to track what we are whitelisting and why. If pn is incompatible we need to be able to note that the image that is created may infact contain incompatible licenses despite INCOMPATIBLE_LICENSE being set. ''' - incompatwl.extend((d.getVar("WHITELIST_" + lic) or "").split()) - if spdx_license: - incompatwl.extend((d.getVar("WHITELIST_" + spdx_license) or "").split()) - - if not pn in whitelist: + bb.note("Including %s as buildable despite it having an incompatible license because it has been whitelisted" % pn) + else: pkgs = d.getVar('PACKAGES').split() skipped_pkgs = [] unskipped_pkgs = [] @@ -562,9 +560,6 @@ python () { elif all_skipped or incompatible_license(d, bad_licenses): bb.debug(1, "SKIPPING recipe %s because it's %s" % (pn, license)) raise bb.parse.SkipRecipe("it has an incompatible license: %s" % license) - elif pn in whitelist: - if pn in incompatwl: - bb.note("INCLUDING " + pn + " as buildable despite INCOMPATIBLE_LICENSE because it has been whitelisted") # Try to verify per-package (LICENSE_) values. LICENSE should be a # superset of all per-package licenses. We do not do advanced (pattern) -- 2.21.0