From patchwork Fri Jun 13 13:16:16 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 64921 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 D1488C71157 for ; Fri, 13 Jun 2025 13:16:31 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.10182.1749820586691947776 for ; Fri, 13 Jun 2025 06:16:26 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 095101C0A for ; Fri, 13 Jun 2025 06:16:06 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 0D80E3F59E for ; Fri, 13 Jun 2025 06:16:25 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 07/10] oe/license_finder: remove unused arguments in get_license_md5sums Date: Fri, 13 Jun 2025 14:16:16 +0100 Message-ID: <20250613131620.221912-7-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250613131620.221912-1-ross.burton@arm.com> References: <20250613131620.221912-1-ross.burton@arm.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, 13 Jun 2025 13:16:31 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/218607 get_license_md5sums() has two optional arguments: - static_only: if set, don't checksum the licenses in COMMON_LICENSE_DIR - linenumbers: if set, the CSV file can contain begin/end/md5 values as used in LIC_FILES_CHKSUM. Neither of these are used and complicate the logic, so remove them. Signed-off-by: Ross Burton --- meta/lib/oe/license_finder.py | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/meta/lib/oe/license_finder.py b/meta/lib/oe/license_finder.py index 097b324c585..be03e5d0846 100644 --- a/meta/lib/oe/license_finder.py +++ b/meta/lib/oe/license_finder.py @@ -14,16 +14,16 @@ import bb logger = logging.getLogger("BitBake.OE.LicenseFinder") -def get_license_md5sums(d, static_only=False, linenumbers=False): +def get_license_md5sums(d): import bb.utils import csv md5sums = {} - if not static_only and not linenumbers: - # Gather md5sums of license files in common license dir - commonlicdir = d.getVar('COMMON_LICENSE_DIR') - for fn in os.listdir(commonlicdir): - md5value = bb.utils.md5_file(os.path.join(commonlicdir, fn)) - md5sums[md5value] = fn + + # Gather md5sums of license files in common license dir + commonlicdir = d.getVar('COMMON_LICENSE_DIR') + for fn in os.listdir(commonlicdir): + md5value = bb.utils.md5_file(os.path.join(commonlicdir, fn)) + md5sums[md5value] = fn # The following were extracted from common values in various recipes # (double checking the license against the license file itself, not just @@ -34,14 +34,9 @@ def get_license_md5sums(d, static_only=False, linenumbers=False): csv_path = os.path.join(path, 'files', 'license-hashes.csv') if os.path.isfile(csv_path): with open(csv_path, newline='') as csv_file: - fieldnames = ['md5sum', 'license', 'beginline', 'endline', 'md5'] - reader = csv.DictReader(csv_file, delimiter=',', fieldnames=fieldnames) + reader = csv.DictReader(csv_file, delimiter=',', fieldnames=['md5sum', 'license']) for row in reader: - if linenumbers: - md5sums[row['md5sum']] = ( - row['license'], row['beginline'], row['endline'], row['md5']) - else: - md5sums[row['md5sum']] = row['license'] + md5sums[row['md5sum']] = row['license'] return md5sums