From patchwork Fri Oct 18 21:59:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joshua Watt X-Patchwork-Id: 50948 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0190D3F2BE for ; Fri, 18 Oct 2024 22:08:34 +0000 (UTC) Received: from mail-oo1-f53.google.com (mail-oo1-f53.google.com [209.85.161.53]) by mx.groups.io with SMTP id smtpd.web10.33570.1729289307246945116 for ; Fri, 18 Oct 2024 15:08:27 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=X7maDBGz; spf=pass (domain: gmail.com, ip: 209.85.161.53, mailfrom: jpewhacker@gmail.com) Received: by mail-oo1-f53.google.com with SMTP id 006d021491bc7-5eb7242cb19so1222998eaf.2 for ; Fri, 18 Oct 2024 15:08:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729289306; x=1729894106; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=eM9x8pzIn8Y1/ro4BZNxKrBbmJEmHf7Fstm+mGguQ3I=; b=X7maDBGzKJTyNasPww8IbkToSOs4t+znC0VartwMLkSxx7QPc3T30JZfYqf64/W5Ey ZhTM6rrefTVdu4e435JTI9p0XkeOk8RNleU1TxxZA/OtcX+t1A5S73hxu2nDdVyug49G 0uYo9Bck5k0Jcbms/VoY2hMDeQVfRBitq45iOKDFW8FN0+k2SFULr/dQWezrvlhVRWXV EVLFUH1Y6ulMVUxBX9+k2S0pfmPAQ5wWdCZVrX2IPGPxh2fz/3Z95p0UZ3ZpAmmVCpo+ zMzBcHc/2TLVfwkN7NY/mPPdjoFczzLTVQpIWNdBnqCmZr2ZCo6sv+moeAZOsni6na60 m8cA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729289306; x=1729894106; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=eM9x8pzIn8Y1/ro4BZNxKrBbmJEmHf7Fstm+mGguQ3I=; b=lCfVjo4YYAuBZPJIzksMgNZNnwa3NGm7/3fWYD9ACUGFSxoWK9aRqPwyQe2P6hCty3 1eYjKvCaHfR50f7i+dMHDpsPJWSyFr4SQw7/kdfO94k/YOhGVhMi79iP3O6Z57i85iFD F4/zuVl1by9EZDuyYqY4vHk8BfU41TiSOSaqCCer5XLDDASs441KuidlkwnILG+Y1xOK sI33fLF4aW5wVE7ad01g/xZPHeQr2zGV2DDdpNFZL6U29HQJb3iXjo9tpLGuyjK5GnKM kJfhwXCNojutLc+9AwOK/Z7QE7ect5P1ZVPDlq/Wsw5sbv+APG9zfkESDyFZ7C7XLjrU lt4g== X-Gm-Message-State: AOJu0Yz4SDRCB19ttmI0emFVuZjFjF1jDFpy1eBa8nWuwY0aCPCvooyJ y4HjRyijaK+P2s22f5Kl/OkXlrq2HCkpc7lrJ3M+oUjlAGzlVvBiYyJL/w== X-Google-Smtp-Source: AGHT+IHsaaFtq/dWyajUwqVHVbcLg5fat6BS6aqaf9edb4XhLVbH/47t5yNng7iOC343l8km78UW7A== X-Received: by 2002:a05:6808:338c:b0:3e5:df4a:50cd with SMTP id 5614622812f47-3e602e3fba4mr2742763b6e.46.1729289305676; Fri, 18 Oct 2024 15:08:25 -0700 (PDT) Received: from localhost.localdomain ([2601:282:4300:19e0::9a72]) by smtp.gmail.com with ESMTPSA id 5614622812f47-3e6029b7874sm554446b6e.8.2024.10.18.15.08.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Oct 2024 15:08:24 -0700 (PDT) From: Joshua Watt X-Google-Original-From: Joshua Watt To: openembedded-core@lists.openembedded.org Cc: Joshua Watt Subject: [OE-core][PATCH 1/4] classes-global/license: Move functions to library code Date: Fri, 18 Oct 2024 15:59:02 -0600 Message-ID: <20241018220818.4042304-2-JPEWhacker@gmail.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241018220818.4042304-1-JPEWhacker@gmail.com> References: <20241018220818.4042304-1-JPEWhacker@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 18 Oct 2024 22:08:34 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/206074 Moves several of the functions in license.bbclass to be library code Signed-off-by: Joshua Watt --- meta/classes-global/base.bbclass | 10 +- meta/classes-global/license.bbclass | 165 ---------------------- meta/classes-recipe/license_image.bbclass | 14 +- meta/lib/oe/license.py | 163 +++++++++++++++++++++ 4 files changed, 175 insertions(+), 177 deletions(-) diff --git a/meta/classes-global/base.bbclass b/meta/classes-global/base.bbclass index b6940bbb6ff..88b932fc3f0 100644 --- a/meta/classes-global/base.bbclass +++ b/meta/classes-global/base.bbclass @@ -528,8 +528,8 @@ python () { bb.fatal('This recipe does not have the LICENSE field set (%s)' % pn) if bb.data.inherits_class('license', d): - check_license_format(d) - unmatched_license_flags = check_license_flags(d) + oe.license.check_license_format(d) + unmatched_license_flags = oe.license.check_license_flags(d) if unmatched_license_flags: for unmatched in unmatched_license_flags: message = "Has a restricted license '%s' which is not listed in your LICENSE_FLAGS_ACCEPTED." % unmatched @@ -583,7 +583,7 @@ python () { check_license = False if check_license and bad_licenses: - bad_licenses = expand_wildcard_licenses(d, bad_licenses) + bad_licenses = oe.license.expand_wildcard_licenses(d, bad_licenses) exceptions = (d.getVar("INCOMPATIBLE_LICENSE_EXCEPTIONS") or "").split() @@ -599,7 +599,7 @@ python () { for pkg in pkgs: remaining_bad_licenses = oe.license.apply_pkg_license_exception(pkg, bad_licenses, exceptions) - incompatible_lic = incompatible_license(d, remaining_bad_licenses, pkg) + incompatible_lic = oe.license.incompatible_license(d, remaining_bad_licenses, pkg) if incompatible_lic: skipped_pkgs[pkg] = incompatible_lic else: @@ -612,7 +612,7 @@ python () { for pkg in unskipped_pkgs: bb.debug(1, "Including the package %s" % pkg) else: - incompatible_lic = incompatible_license(d, bad_licenses) + incompatible_lic = oe.license.incompatible_license(d, bad_licenses) for pkg in skipped_pkgs: incompatible_lic += skipped_pkgs[pkg] incompatible_lic = sorted(list(set(incompatible_lic))) diff --git a/meta/classes-global/license.bbclass b/meta/classes-global/license.bbclass index 043715fcc36..94dcc7f331c 100644 --- a/meta/classes-global/license.bbclass +++ b/meta/classes-global/license.bbclass @@ -255,171 +255,6 @@ def find_license_files(d): return lic_files_paths -def return_spdx(d, license): - """ - This function returns the spdx mapping of a license if it exists. - """ - return d.getVarFlag('SPDXLICENSEMAP', license) - -def canonical_license(d, license): - """ - Return the canonical (SPDX) form of the license if available (so GPLv3 - becomes GPL-3.0-only) or the passed license if there is no canonical form. - """ - return d.getVarFlag('SPDXLICENSEMAP', license) or license - -def expand_wildcard_licenses(d, wildcard_licenses): - """ - There are some common wildcard values users may want to use. Support them - here. - """ - licenses = set(wildcard_licenses) - mapping = { - "AGPL-3.0*" : ["AGPL-3.0-only", "AGPL-3.0-or-later"], - "GPL-3.0*" : ["GPL-3.0-only", "GPL-3.0-or-later"], - "LGPL-3.0*" : ["LGPL-3.0-only", "LGPL-3.0-or-later"], - } - for k in mapping: - if k in wildcard_licenses: - licenses.remove(k) - for item in mapping[k]: - licenses.add(item) - - for l in licenses: - if l in oe.license.obsolete_license_list(): - bb.fatal("Error, %s is an obsolete license, please use an SPDX reference in INCOMPATIBLE_LICENSE" % l) - if "*" in l: - bb.fatal("Error, %s is an invalid license wildcard entry" % l) - - return list(licenses) - -def incompatible_license_contains(license, truevalue, falsevalue, d): - license = canonical_license(d, license) - bad_licenses = (d.getVar('INCOMPATIBLE_LICENSE') or "").split() - bad_licenses = expand_wildcard_licenses(d, bad_licenses) - return truevalue if license in bad_licenses else falsevalue - -def incompatible_pkg_license(d, dont_want_licenses, license): - # Handles an "or" or two license sets provided by - # flattened_licenses(), pick one that works if possible. - def choose_lic_set(a, b): - return a if all(oe.license.license_ok(canonical_license(d, lic), - dont_want_licenses) for lic in a) else b - - try: - licenses = oe.license.flattened_licenses(license, choose_lic_set) - except oe.license.LicenseError as exc: - bb.fatal('%s: %s' % (d.getVar('P'), exc)) - - incompatible_lic = [] - for l in licenses: - license = canonical_license(d, l) - if not oe.license.license_ok(license, dont_want_licenses): - incompatible_lic.append(license) - - return sorted(incompatible_lic) - -def incompatible_license(d, dont_want_licenses, package=None): - """ - This function checks if a recipe has only incompatible licenses. It also - take into consideration 'or' operand. dont_want_licenses should be passed - as canonical (SPDX) names. - """ - import oe.license - license = d.getVar("LICENSE:%s" % package) if package else None - if not license: - license = d.getVar('LICENSE') - - return incompatible_pkg_license(d, dont_want_licenses, license) - -def check_license_flags(d): - """ - This function checks if a recipe has any LICENSE_FLAGS that - aren't acceptable. - - If it does, it returns the all LICENSE_FLAGS missing from the list - of acceptable license flags, or all of the LICENSE_FLAGS if there - is no list of acceptable flags. - - If everything is is acceptable, it returns None. - """ - - def license_flag_matches(flag, acceptlist, pn): - """ - Return True if flag matches something in acceptlist, None if not. - - Before we test a flag against the acceptlist, we append _${PN} - to it. We then try to match that string against the - acceptlist. This covers the normal case, where we expect - LICENSE_FLAGS to be a simple string like 'commercial', which - the user typically matches exactly in the acceptlist by - explicitly appending the package name e.g 'commercial_foo'. - If we fail the match however, we then split the flag across - '_' and append each fragment and test until we either match or - run out of fragments. - """ - flag_pn = ("%s_%s" % (flag, pn)) - for candidate in acceptlist: - if flag_pn == candidate: - return True - - flag_cur = "" - flagments = flag_pn.split("_") - flagments.pop() # we've already tested the full string - for flagment in flagments: - if flag_cur: - flag_cur += "_" - flag_cur += flagment - for candidate in acceptlist: - if flag_cur == candidate: - return True - return False - - def all_license_flags_match(license_flags, acceptlist): - """ Return all unmatched flags, None if all flags match """ - pn = d.getVar('PN') - split_acceptlist = acceptlist.split() - flags = [] - for flag in license_flags.split(): - if not license_flag_matches(flag, split_acceptlist, pn): - flags.append(flag) - return flags if flags else None - - license_flags = d.getVar('LICENSE_FLAGS') - if license_flags: - acceptlist = d.getVar('LICENSE_FLAGS_ACCEPTED') - if not acceptlist: - return license_flags.split() - unmatched_flags = all_license_flags_match(license_flags, acceptlist) - if unmatched_flags: - return unmatched_flags - return None - -def check_license_format(d): - """ - This function checks if LICENSE is well defined, - Validate operators in LICENSES. - No spaces are allowed between LICENSES. - """ - pn = d.getVar('PN') - licenses = d.getVar('LICENSE') - from oe.license import license_operator, license_operator_chars, license_pattern - - elements = list(filter(lambda x: x.strip(), license_operator.split(licenses))) - for pos, element in enumerate(elements): - if license_pattern.match(element): - if pos > 0 and license_pattern.match(elements[pos - 1]): - oe.qa.handle_error('license-format', - '%s: LICENSE value "%s" has an invalid format - license names ' \ - 'must be separated by the following characters to indicate ' \ - 'the license selection: %s' % - (pn, licenses, license_operator_chars), d) - elif not license_operator.match(element): - oe.qa.handle_error('license-format', - '%s: LICENSE value "%s" has an invalid separator "%s" that is not ' \ - 'in the valid list of separators (%s)' % - (pn, licenses, element, license_operator_chars), d) - SSTATETASKS += "do_populate_lic" do_populate_lic[sstate-inputdirs] = "${LICSSTATEDIR}" do_populate_lic[sstate-outputdirs] = "${LICENSE_DIRECTORY}/" diff --git a/meta/classes-recipe/license_image.bbclass b/meta/classes-recipe/license_image.bbclass index 0e953856a63..d2c5ab902ce 100644 --- a/meta/classes-recipe/license_image.bbclass +++ b/meta/classes-recipe/license_image.bbclass @@ -58,7 +58,7 @@ def write_license_files(d, license_manifest, pkg_dic, rootfs=True): import stat bad_licenses = (d.getVar("INCOMPATIBLE_LICENSE") or "").split() - bad_licenses = expand_wildcard_licenses(d, bad_licenses) + bad_licenses = oe.license.expand_wildcard_licenses(d, bad_licenses) pkgarchs = d.getVar("SSTATE_ARCHS").split() pkgarchs.reverse() @@ -66,17 +66,17 @@ def write_license_files(d, license_manifest, pkg_dic, rootfs=True): with open(license_manifest, "w") as license_file: for pkg in sorted(pkg_dic): remaining_bad_licenses = oe.license.apply_pkg_license_exception(pkg, bad_licenses, exceptions) - incompatible_licenses = incompatible_pkg_license(d, remaining_bad_licenses, pkg_dic[pkg]["LICENSE"]) + incompatible_licenses = oe.license.incompatible_pkg_license(d, remaining_bad_licenses, pkg_dic[pkg]["LICENSE"]) if incompatible_licenses: bb.fatal("Package %s cannot be installed into the image because it has incompatible license(s): %s" %(pkg, ' '.join(incompatible_licenses))) else: - incompatible_licenses = incompatible_pkg_license(d, bad_licenses, pkg_dic[pkg]["LICENSE"]) + incompatible_licenses = oe.license.incompatible_pkg_license(d, bad_licenses, pkg_dic[pkg]["LICENSE"]) if incompatible_licenses: oe.qa.handle_error('license-exception', "Including %s with incompatible license(s) %s into the image, because it has been allowed by exception list." %(pkg, ' '.join(incompatible_licenses)), d) try: (pkg_dic[pkg]["LICENSE"], pkg_dic[pkg]["LICENSES"]) = \ oe.license.manifest_licenses(pkg_dic[pkg]["LICENSE"], - remaining_bad_licenses, canonical_license, d) + remaining_bad_licenses, oe.license.canonical_license, d) except oe.license.LicenseError as exc: bb.fatal('%s: %s' % (d.getVar('P'), exc)) @@ -144,7 +144,7 @@ def write_license_files(d, license_manifest, pkg_dic, rootfs=True): if not os.path.exists(pkg_license_dir ): bb.fatal("Couldn't find license information for dependency %s" % pkg) - pkg_manifest_licenses = [canonical_license(d, lic) \ + pkg_manifest_licenses = [oe.license.canonical_license(d, lic) \ for lic in pkg_dic[pkg]["LICENSES"]] licenses = os.listdir(pkg_license_dir) @@ -153,7 +153,7 @@ def write_license_files(d, license_manifest, pkg_dic, rootfs=True): pkg_rootfs_license = os.path.join(pkg_rootfs_license_dir, lic) if re.match(r"^generic_.*$", lic): - generic_lic = canonical_license(d, + generic_lic = oe.license.canonical_license(d, re.search(r"^generic_(.*)$", lic).group(1)) # Do not copy generic license into package if isn't @@ -176,7 +176,7 @@ def write_license_files(d, license_manifest, pkg_dic, rootfs=True): if not os.path.exists(pkg_rootfs_license): os.symlink(os.path.join('..', generic_lic_file), pkg_rootfs_license) else: - if (oe.license.license_ok(canonical_license(d, + if (oe.license.license_ok(oe.license.canonical_license(d, lic), bad_licenses) == False or os.path.exists(pkg_rootfs_license)): continue diff --git a/meta/lib/oe/license.py b/meta/lib/oe/license.py index d9c8d94da47..7739697c401 100644 --- a/meta/lib/oe/license.py +++ b/meta/lib/oe/license.py @@ -259,3 +259,166 @@ def apply_pkg_license_exception(pkg, bad_licenses, exceptions): """Return remaining bad licenses after removing any package exceptions""" return [lic for lic in bad_licenses if pkg + ':' + lic not in exceptions] + +def return_spdx(d, license): + """ + This function returns the spdx mapping of a license if it exists. + """ + return d.getVarFlag('SPDXLICENSEMAP', license) + +def canonical_license(d, license): + """ + Return the canonical (SPDX) form of the license if available (so GPLv3 + becomes GPL-3.0-only) or the passed license if there is no canonical form. + """ + return d.getVarFlag('SPDXLICENSEMAP', license) or license + +def expand_wildcard_licenses(d, wildcard_licenses): + """ + There are some common wildcard values users may want to use. Support them + here. + """ + licenses = set(wildcard_licenses) + mapping = { + "AGPL-3.0*" : ["AGPL-3.0-only", "AGPL-3.0-or-later"], + "GPL-3.0*" : ["GPL-3.0-only", "GPL-3.0-or-later"], + "LGPL-3.0*" : ["LGPL-3.0-only", "LGPL-3.0-or-later"], + } + for k in mapping: + if k in wildcard_licenses: + licenses.remove(k) + for item in mapping[k]: + licenses.add(item) + + for l in licenses: + if l in obsolete_license_list(): + bb.fatal("Error, %s is an obsolete license, please use an SPDX reference in INCOMPATIBLE_LICENSE" % l) + if "*" in l: + bb.fatal("Error, %s is an invalid license wildcard entry" % l) + + return list(licenses) + +def incompatible_license_contains(license, truevalue, falsevalue, d): + license = canonical_license(d, license) + bad_licenses = (d.getVar('INCOMPATIBLE_LICENSE') or "").split() + bad_licenses = expand_wildcard_licenses(d, bad_licenses) + return truevalue if license in bad_licenses else falsevalue + +def incompatible_pkg_license(d, dont_want_licenses, license): + # Handles an "or" or two license sets provided by + # flattened_licenses(), pick one that works if possible. + def choose_lic_set(a, b): + return a if all(license_ok(canonical_license(d, lic), + dont_want_licenses) for lic in a) else b + + try: + licenses = flattened_licenses(license, choose_lic_set) + except LicenseError as exc: + bb.fatal('%s: %s' % (d.getVar('P'), exc)) + + incompatible_lic = [] + for l in licenses: + license = canonical_license(d, l) + if not license_ok(license, dont_want_licenses): + incompatible_lic.append(license) + + return sorted(incompatible_lic) + +def incompatible_license(d, dont_want_licenses, package=None): + """ + This function checks if a recipe has only incompatible licenses. It also + take into consideration 'or' operand. dont_want_licenses should be passed + as canonical (SPDX) names. + """ + license = d.getVar("LICENSE:%s" % package) if package else None + if not license: + license = d.getVar('LICENSE') + + return incompatible_pkg_license(d, dont_want_licenses, license) + +def check_license_flags(d): + """ + This function checks if a recipe has any LICENSE_FLAGS that + aren't acceptable. + + If it does, it returns the all LICENSE_FLAGS missing from the list + of acceptable license flags, or all of the LICENSE_FLAGS if there + is no list of acceptable flags. + + If everything is is acceptable, it returns None. + """ + + def license_flag_matches(flag, acceptlist, pn): + """ + Return True if flag matches something in acceptlist, None if not. + + Before we test a flag against the acceptlist, we append _${PN} + to it. We then try to match that string against the + acceptlist. This covers the normal case, where we expect + LICENSE_FLAGS to be a simple string like 'commercial', which + the user typically matches exactly in the acceptlist by + explicitly appending the package name e.g 'commercial_foo'. + If we fail the match however, we then split the flag across + '_' and append each fragment and test until we either match or + run out of fragments. + """ + flag_pn = ("%s_%s" % (flag, pn)) + for candidate in acceptlist: + if flag_pn == candidate: + return True + + flag_cur = "" + flagments = flag_pn.split("_") + flagments.pop() # we've already tested the full string + for flagment in flagments: + if flag_cur: + flag_cur += "_" + flag_cur += flagment + for candidate in acceptlist: + if flag_cur == candidate: + return True + return False + + def all_license_flags_match(license_flags, acceptlist): + """ Return all unmatched flags, None if all flags match """ + pn = d.getVar('PN') + split_acceptlist = acceptlist.split() + flags = [] + for flag in license_flags.split(): + if not license_flag_matches(flag, split_acceptlist, pn): + flags.append(flag) + return flags if flags else None + + license_flags = d.getVar('LICENSE_FLAGS') + if license_flags: + acceptlist = d.getVar('LICENSE_FLAGS_ACCEPTED') + if not acceptlist: + return license_flags.split() + unmatched_flags = all_license_flags_match(license_flags, acceptlist) + if unmatched_flags: + return unmatched_flags + return None + +def check_license_format(d): + """ + This function checks if LICENSE is well defined, + Validate operators in LICENSES. + No spaces are allowed between LICENSES. + """ + pn = d.getVar('PN') + licenses = d.getVar('LICENSE') + + elements = list(filter(lambda x: x.strip(), license_operator.split(licenses))) + for pos, element in enumerate(elements): + if license_pattern.match(element): + if pos > 0 and license_pattern.match(elements[pos - 1]): + oe.qa.handle_error('license-format', + '%s: LICENSE value "%s" has an invalid format - license names ' \ + 'must be separated by the following characters to indicate ' \ + 'the license selection: %s' % + (pn, licenses, license_operator_chars), d) + elif not license_operator.match(element): + oe.qa.handle_error('license-format', + '%s: LICENSE value "%s" has an invalid separator "%s" that is not ' \ + 'in the valid list of separators (%s)' % + (pn, licenses, element, license_operator_chars), d) From patchwork Fri Oct 18 21:59:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joshua Watt X-Patchwork-Id: 50947 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id CEF5ED3F2BB for ; Fri, 18 Oct 2024 22:08:34 +0000 (UTC) Received: from mail-oi1-f174.google.com (mail-oi1-f174.google.com [209.85.167.174]) by mx.groups.io with SMTP id smtpd.web10.33573.1729289309981394209 for ; Fri, 18 Oct 2024 15:08:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=h4unN10a; spf=pass (domain: gmail.com, ip: 209.85.167.174, mailfrom: jpewhacker@gmail.com) Received: by mail-oi1-f174.google.com with SMTP id 5614622812f47-3e6005781c0so966728b6e.3 for ; Fri, 18 Oct 2024 15:08:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729289308; x=1729894108; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=k4fay7qcHrEpKnh6n6qL2gXUE736MQW/eCFY5zW5btY=; b=h4unN10agjUKg0uWhksePTHhsJhAFwDh8QeLABPy94JLKUBTEzDHb1GsYRHMert26F c6E84JzmgAfXAkQ+JaqB9Bg8qokYdfUh3AHMUHnrLxkNA61dMeEwBHM70jO4EAQOK9kR 3+ffntJGAD5gq+ytB0sdlU0hcZ5R8ASIP9wpXzIE+LUR2X3YiHWRIQX/2ANHmSq/wo+L j9q96G7jHvH5KWVc4++smY0YLNdunSvFAZiKp6rzzjFghqj8RI4pDDh99L+77TrR2Da7 UCfY5BvgNwBV+W9Zhzyq2EhpBOFTd5759p+HaRS2Y8j5kApeBWtlpACTtUOnAF9QUizX bGuw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729289308; x=1729894108; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=k4fay7qcHrEpKnh6n6qL2gXUE736MQW/eCFY5zW5btY=; b=l2Mu5Wybs/9mZB+r+T3xnNfzCfpBX5mCn17srqD8ad0GL3bw32YDYwLNno/RY86p9e 3PMMK3Ky9IN0+lEaYvTJk8hul2UQRa+yxq3AcVQyrZwC/kfHR9M2dnsOujtzGGfEjmpA fJP/BJTCo6lugZ8IhZSCNWSxxOnpQO4bbo+Wr7UfX8YO3Haqp92OtIeX7lbFc6r1oOkl nNNz/CbCQD2NJJuiX45bUwYcEqwYEbvAYpt9jHm3aRTfPJ6qW+ujsoHizsYHcKQVo9eM +Qkrp5ukdtzv6CuoJTtBES12URwnTL4EVoVM4/TeM//9IuvFDu2qRxj2hplPR5jiJD/R 5KxA== X-Gm-Message-State: AOJu0YxoysVmcseanmSnFYMjsd6pMVaBPRf1t8nNgXTR3vCmaD9IrZ6j Rmkxb2V9xZhbyYP4sjichWYgrSwqqZoCVLEQJ9/E0P+gXPuiK3AArJmAuA== X-Google-Smtp-Source: AGHT+IH9DY3Xoi2dWNlxj0RlQ5HoPEezzw/OoU1kLrGWhP8mYGwyXwT4fkV7iQvAYd/ItT5gKYMz/A== X-Received: by 2002:a05:6808:159e:b0:3e5:fe39:7f10 with SMTP id 5614622812f47-3e602c58dbcmr4251283b6e.10.1729289308666; Fri, 18 Oct 2024 15:08:28 -0700 (PDT) Received: from localhost.localdomain ([2601:282:4300:19e0::9a72]) by smtp.gmail.com with ESMTPSA id 5614622812f47-3e6029b7874sm554446b6e.8.2024.10.18.15.08.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Oct 2024 15:08:27 -0700 (PDT) From: Joshua Watt X-Google-Original-From: Joshua Watt To: openembedded-core@lists.openembedded.org Cc: Joshua Watt Subject: [OE-core][PATCH 2/4] lib: license: Move package license skip to library Date: Fri, 18 Oct 2024 15:59:03 -0600 Message-ID: <20241018220818.4042304-3-JPEWhacker@gmail.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241018220818.4042304-1-JPEWhacker@gmail.com> References: <20241018220818.4042304-1-JPEWhacker@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 18 Oct 2024 22:08:34 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/206075 Moves the code that skips packages with incompatible licenses to the library code so that it can be called in other locations Signed-off-by: Joshua Watt --- meta/classes-global/base.bbclass | 36 ++++------------------------ meta/lib/oe/license.py | 40 ++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+), 32 deletions(-) diff --git a/meta/classes-global/base.bbclass b/meta/classes-global/base.bbclass index 88b932fc3f0..b81e61fdb72 100644 --- a/meta/classes-global/base.bbclass +++ b/meta/classes-global/base.bbclass @@ -573,42 +573,14 @@ python () { bad_licenses = (d.getVar('INCOMPATIBLE_LICENSE') or "").split() - check_license = False if pn.startswith("nativesdk-") else True - for t in ["-native", "-cross-${TARGET_ARCH}", "-cross-initial-${TARGET_ARCH}", - "-crosssdk-${SDK_SYS}", "-crosssdk-initial-${SDK_SYS}", - "-cross-canadian-${TRANSLATED_TARGET_ARCH}"]: - if pn.endswith(d.expand(t)): - check_license = False - if pn.startswith("gcc-source-"): - check_license = False - - if check_license and bad_licenses: - bad_licenses = oe.license.expand_wildcard_licenses(d, bad_licenses) - - exceptions = (d.getVar("INCOMPATIBLE_LICENSE_EXCEPTIONS") or "").split() - - for lic_exception in exceptions: - if ":" in lic_exception: - lic_exception = lic_exception.split(":")[1] - if lic_exception in oe.license.obsolete_license_list(): - bb.fatal("Obsolete license %s used in INCOMPATIBLE_LICENSE_EXCEPTIONS" % lic_exception) - - pkgs = d.getVar('PACKAGES').split() - skipped_pkgs = {} - unskipped_pkgs = [] - for pkg in pkgs: - remaining_bad_licenses = oe.license.apply_pkg_license_exception(pkg, bad_licenses, exceptions) - - incompatible_lic = oe.license.incompatible_license(d, remaining_bad_licenses, pkg) - if incompatible_lic: - skipped_pkgs[pkg] = incompatible_lic - else: - unskipped_pkgs.append(pkg) + pkgs = d.getVar('PACKAGES').split() + if pkgs: + skipped_pkgs = oe.license.skip_incompatible_package_licenses(d, pkgs) + unskipped_pkgs = [p for p in pkgs if p not in skipped_pkgs] if unskipped_pkgs: for pkg in skipped_pkgs: bb.debug(1, "Skipping the package %s at do_rootfs because of incompatible license(s): %s" % (pkg, ' '.join(skipped_pkgs[pkg]))) - d.setVar('_exclude_incompatible-' + pkg, ' '.join(skipped_pkgs[pkg])) for pkg in unskipped_pkgs: bb.debug(1, "Including the package %s" % pkg) else: diff --git a/meta/lib/oe/license.py b/meta/lib/oe/license.py index 7739697c401..75b1e70ba0e 100644 --- a/meta/lib/oe/license.py +++ b/meta/lib/oe/license.py @@ -422,3 +422,43 @@ def check_license_format(d): '%s: LICENSE value "%s" has an invalid separator "%s" that is not ' \ 'in the valid list of separators (%s)' % (pn, licenses, element, license_operator_chars), d) + +def skip_incompatible_package_licenses(d, pkgs): + if not pkgs: + return {} + + pn = d.getVar("PN") + bad_licenses = (d.getVar('INCOMPATIBLE_LICENSE') or "").split() + + check_license = False if pn.startswith("nativesdk-") else True + for t in ["-native", "-cross-${TARGET_ARCH}", "-cross-initial-${TARGET_ARCH}", + "-crosssdk-${SDK_SYS}", "-crosssdk-initial-${SDK_SYS}", + "-cross-canadian-${TRANSLATED_TARGET_ARCH}"]: + if pn.endswith(d.expand(t)): + check_license = False + if pn.startswith("gcc-source-"): + check_license = False + + if not check_license or not bad_licenses: + return {} + + bad_licenses = expand_wildcard_licenses(d, bad_licenses) + + exceptions = (d.getVar("INCOMPATIBLE_LICENSE_EXCEPTIONS") or "").split() + + for lic_exception in exceptions: + if ":" in lic_exception: + lic_exception = lic_exception.split(":")[1] + if lic_exception in obsolete_license_list(): + bb.fatal("Obsolete license %s used in INCOMPATIBLE_LICENSE_EXCEPTIONS" % lic_exception) + + skipped_pkgs = {} + for pkg in pkgs: + remaining_bad_licenses = apply_pkg_license_exception(pkg, bad_licenses, exceptions) + + incompatible_lic = incompatible_license(d, remaining_bad_licenses, pkg) + if incompatible_lic: + skipped_pkgs[pkg] = incompatible_lic + d.setVar('_exclude_incompatible-' + pkg, ' '.join(incompatible_lic)) + + return skipped_pkgs From patchwork Fri Oct 18 21:59:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joshua Watt X-Patchwork-Id: 50949 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D6D94D3F2B4 for ; Fri, 18 Oct 2024 22:08:34 +0000 (UTC) Received: from mail-oi1-f179.google.com (mail-oi1-f179.google.com [209.85.167.179]) by mx.groups.io with SMTP id smtpd.web10.33574.1729289312296201377 for ; Fri, 18 Oct 2024 15:08:32 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=nnzxiPCC; spf=pass (domain: gmail.com, ip: 209.85.167.179, mailfrom: jpewhacker@gmail.com) Received: by mail-oi1-f179.google.com with SMTP id 5614622812f47-3e5fcf464ecso1325250b6e.0 for ; Fri, 18 Oct 2024 15:08:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729289310; x=1729894110; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=0RkQ3Yr25/1Aih2s/xea43dFsB8mIfMeCEVp68moFTY=; b=nnzxiPCC72OD442vIP9W2VFUYmsRCq7HfBuKv7BsmB1txazdz/0QWQDZ3r2Kb2kMQw sRyRK/rFXKQ8KHI6uUu6tUPXgVoPzG7bZzW/n4nqPiBfO1Bd3Fmjt4GOuNeYYWIvkLXG l9ra4E0sCi2FZq1biibbRdggSQQ3KWD2BLds2hnHuQl6Bf+9w4/G4HvdAIrxOXSbAiSj yk35fxQmRoE0ITAl3oxHsD7iOjqiS2WIyGw8xOvDGRWvUcfTG5E/UFFB9UI3OcTzrWkH 2I7DnNSBcB65yB4V3YQQr0xZgdlS+/g0MAGx7MaX6GrnMsjrfM/nT0JaZwxIk1rasngx a6Sg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729289310; x=1729894110; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=0RkQ3Yr25/1Aih2s/xea43dFsB8mIfMeCEVp68moFTY=; b=m7+Qmeq70g74uuPhp6/b3eTXrzkEO6PswnpXjTYkgthjuY6efFtWeDiev6Tg25SNgU hHhMiy3ytef+d70FaXOOGycdO3fUHezQyPmN22AOBMDFKAxioYDxdsqOYbI5oQyj66I9 ywY7iVy0sCYIl8+aD7yrpDNM0JVNXNlm1OtNE1BPIM4ez2cIORN2RkBbFaVLmKtfwa3o D53x6JH3CF3MgvCCZLIJgysIB1805+++zB6Xz4LVkihf7EWFhog99r0JuMB3nnPl9I+Z UpGls6rDg4soxb/CA+1q+MijZnoP2bPNVe5NhWp8YVFA5byjaQ2NtnoKI0VIom6JCUo5 6WXA== X-Gm-Message-State: AOJu0Yzs7oYpzmCumwNoo4rFWM7zvtLvOf0B7fV7xIPzFlB/IzemxxpX OwZwcfhpvTJx6Z30eoCaGCUyRamRCtGlaSSkR7FrwpiY6spBC1ybLD7mcA== X-Google-Smtp-Source: AGHT+IFk2V0kNZybZ2XdOyZMYM9ZqaKWn6G37mxbhKi9AyvxnFGGeXBw4Zj1dTniVT22dt4H8uCNWA== X-Received: by 2002:a05:6808:164a:b0:3e0:43b5:d768 with SMTP id 5614622812f47-3e602cf9a4cmr3554428b6e.27.1729289310576; Fri, 18 Oct 2024 15:08:30 -0700 (PDT) Received: from localhost.localdomain ([2601:282:4300:19e0::9a72]) by smtp.gmail.com with ESMTPSA id 5614622812f47-3e6029b7874sm554446b6e.8.2024.10.18.15.08.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Oct 2024 15:08:30 -0700 (PDT) From: Joshua Watt X-Google-Original-From: Joshua Watt To: openembedded-core@lists.openembedded.org Cc: Joshua Watt Subject: [OE-core][PATCH 3/4] lib: package: Check for incompatible licenses in locale packages Date: Fri, 18 Oct 2024 15:59:04 -0600 Message-ID: <20241018220818.4042304-4-JPEWhacker@gmail.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241018220818.4042304-1-JPEWhacker@gmail.com> References: <20241018220818.4042304-1-JPEWhacker@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 18 Oct 2024 22:08:34 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/206076 Checks if incompatible licenses are present in the dynamically generated locale packages Signed-off-by: Joshua Watt --- meta/lib/oe/package.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py index c213a9a3ca6..37fbfe355cb 100644 --- a/meta/lib/oe/package.py +++ b/meta/lib/oe/package.py @@ -685,9 +685,11 @@ def split_locales(d): description = d.getVar('DESCRIPTION') or "" locale_section = d.getVar('LOCALE_SECTION') mlprefix = d.getVar('MLPREFIX') or "" + locale_pkgs = [] for l in sorted(locales): ln = legitimize_package_name(l) pkg = pn + '-locale-' + ln + locale_pkgs.append(pkg) packages.insert(locale_index, pkg) locale_index += 1 files = [] @@ -702,6 +704,7 @@ def split_locales(d): d.setVar('SECTION:' + pkg, locale_section) d.setVar('PACKAGES', ' '.join(packages)) + oe.license.skip_incompatible_package_licenses(d, locale_pkgs) # Disabled by RP 18/06/07 # Wildcards aren't supported in debian From patchwork Fri Oct 18 21:59:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joshua Watt X-Patchwork-Id: 50950 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id C66E2D3F2BE for ; Fri, 18 Oct 2024 22:08:44 +0000 (UTC) Received: from mail-oi1-f178.google.com (mail-oi1-f178.google.com [209.85.167.178]) by mx.groups.io with SMTP id smtpd.web11.33716.1729289314730810693 for ; Fri, 18 Oct 2024 15:08:34 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Qb9uREP6; spf=pass (domain: gmail.com, ip: 209.85.167.178, mailfrom: jpewhacker@gmail.com) Received: by mail-oi1-f178.google.com with SMTP id 5614622812f47-3e5f533e1c2so1244103b6e.3 for ; Fri, 18 Oct 2024 15:08:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729289313; x=1729894113; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=E8CBUtINDV8YtRa/B+xKCLhcLleDI03OplEkc3TtxAo=; b=Qb9uREP6I+8hCI7g3SoMqdVSMlVi2xbAfjZ7PQ6PbIamnbIvlgTpDZw8kTAvlXyA4H qNp/3o9SzjDI11eZ+Cytw0cyxvcopduUD33qh+bAF31MxMMWf8hxDsaX42l62wpvYy+Y r8w6BvY4UbKVWmzY4yD4xEM154+hLtdTD/vey5voEPseRTxsDONZHHF5WsuUemId4vaM NGXYZNX9flbcrHedb+yd73PvIgeBAlnvlM8d7fSkYW1e3q1FOsfuucB7V2MZCdeDxeH6 GDO9xlF0jbYJFWlG5g4BijVifK3ySu10SaCJSoNxztic2Y3pFE1oKEABygZwatgwgSrr +J4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729289313; x=1729894113; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=E8CBUtINDV8YtRa/B+xKCLhcLleDI03OplEkc3TtxAo=; b=rnMKzGVscYEvrnoQhML3uZhJTQvhcOhkSKtpPF5gkdGNo6FcPelJ04mk+gNSfRPhxo +gvbr7WO7HQs74PhL1dNZBaIRSdrO9ltXJSYrWDlcNr4/cWNuQf3wCpJDsc+qWd97+pe u/309dz6smhqFiO4+KMJ2OJLxmllecwo4sZADcErc3UsP8s2oRIqrdYIzd4bPV5dEmY/ jvrzBBu7jhCQVb6eqreYJ+4zpQMMJQfcYbM3M7BqMUq+nV7XZA0Y6gDmUiBCLrqTJr+b OdR0c25I0Abfpn/7vlU763zRfOjSP9J5whIfJkKNX1wh7dcRsrtbmNY/XJnWwyT77QW3 dKlQ== X-Gm-Message-State: AOJu0YzY4n6jyG1FYP4p5LpreGVIrIwV5993FVFnM3uovWjAgnkKLyTm U7YMLdbPXyugolZpMDdbRrGa4TRfZH6C4GDo7d72azJYpNAwxVwajJW1KQ== X-Google-Smtp-Source: AGHT+IGMk5jX4KFAk8Mi/dd+Dd+8jlbDCVid7CojWgUHAZ3pLR/su/0Yi6IyTqitm3ojcwJpEuCzSQ== X-Received: by 2002:a05:6808:bd5:b0:3e6:264:2988 with SMTP id 5614622812f47-3e602d8c1d2mr3992516b6e.35.1729289313478; Fri, 18 Oct 2024 15:08:33 -0700 (PDT) Received: from localhost.localdomain ([2601:282:4300:19e0::9a72]) by smtp.gmail.com with ESMTPSA id 5614622812f47-3e6029b7874sm554446b6e.8.2024.10.18.15.08.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Oct 2024 15:08:31 -0700 (PDT) From: Joshua Watt X-Google-Original-From: Joshua Watt To: openembedded-core@lists.openembedded.org Cc: Joshua Watt Subject: [OE-core][PATCH 4/4] lib: package: Copy locale license Date: Fri, 18 Oct 2024 15:59:05 -0600 Message-ID: <20241018220818.4042304-5-JPEWhacker@gmail.com> X-Mailer: git-send-email 2.46.2 In-Reply-To: <20241018220818.4042304-1-JPEWhacker@gmail.com> References: <20241018220818.4042304-1-JPEWhacker@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Fri, 18 Oct 2024 22:08:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/206077 When creating split locales, copy the license from LICENSE:${PN}-locale if set, otherwise leave it unspecified (which will result in falling back to LICENSE) Signed-off-by: Joshua Watt --- meta/lib/oe/package.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py index 37fbfe355cb..be8bffbd37b 100644 --- a/meta/lib/oe/package.py +++ b/meta/lib/oe/package.py @@ -663,6 +663,8 @@ def split_locales(d): except ValueError: locale_index = len(packages) + lic = d.getVar("LICENSE:" + pn + "-locale") + localepaths = [] locales = set() for localepath in (d.getVar('LOCALE_PATHS') or "").split(): @@ -700,6 +702,8 @@ def split_locales(d): d.setVar('RPROVIDES:' + pkg, '%s-locale %s%s-translation' % (pn, mlprefix, ln)) d.setVar('SUMMARY:' + pkg, '%s - %s translations' % (summary, l)) d.setVar('DESCRIPTION:' + pkg, '%s This package contains language translation files for the %s locale.' % (description, l)) + if lic: + d.setVar('LICENSE:' + pkg, lic) if locale_section: d.setVar('SECTION:' + pkg, locale_section)