From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp1.axis.com (smtp1.axis.com [195.60.68.17]) by mail.openembedded.org (Postfix) with ESMTP id 8A57C7FBB3 for ; Wed, 11 Dec 2019 16:48:23 +0000 (UTC) IronPort-SDR: 0JSopIOGny5IvGiWh9tEos138GnVovLZolUQQ1g6jdRZeFOP1pOermJDY6g/fPz2+tMQXfG+uN 0WViwB6DNG1PSffrbXVJTQk4tv79wfOivDOe5tNLokHtLCSp9kaZYYN5kmalsvE4arIveHuQBH 7qhifOr3IVukpJdvdgobCtpSZFIDJ2y+o3CpjIVSZJ7FU+l3mKux8mQE9juSyFGG+zJAXZiJ2e j1C8292Kxv4C8txxoD/iNq4jw7cvuvv9KOVZYInR0SoLNhsz0C1l9bslmoX0jbwoxG0KznkdCf RnU= X-IronPort-AV: E=Sophos;i="5.69,302,1571695200"; d="scan'208";a="3494978" 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 17:48:18 +0100 Message-Id: <20191211164820.26588-6-pkj@axis.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191211164820.26588-1-pkj@axis.com> References: <20191211164820.26588-1-pkj@axis.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 Subject: [PATCHv3 6/8] package.bbclass: Report only the licenses that are incompatible 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 16:48:24 -0000 Content-Transfer-Encoding: 8bit When excluding a package from being packaged due to incompatible licenses, report the license(s) that are actually incompatible. Signed-off-by: Peter Kjellerstedt --- PATCHv2: Show the names of the incompatible licenses correctly. meta/classes/package.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index e0d6ff6701..ef3de35961 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -1263,8 +1263,9 @@ python populate_packages () { # Handle LICENSE_EXCLUSION package_list = [] for pkg in packages: - if d.getVar('LICENSE_EXCLUSION-' + pkg): - msg = "%s has an incompatible license. Excluding from packaging." % pkg + licenses = d.getVar('LICENSE_EXCLUSION-' + pkg) + if licenses: + msg = "Excluding %s from packaging as it has incompatible license(s): %s" % (pkg, licenses) package_qa_handle_error("incompatible-license", msg, d) else: package_list.append(pkg) -- 2.21.0