MIRRORS/poky
1
0
Fork 0
mirror of git://git.yoctoproject.org/poky.git synced 2025-07-19 21:09:03 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

oe/license_finder: remove unused arguments in get_license_md5sums

Browse Source 
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.

(From OE-Core rev: 148e501bd4fe65e7bed68d086ba98180a9b2483c)

Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton 2025-06-13 14:16:16 +01:00 committed by Richard Purdie
parent 6496804bac
commit 0d175076fe
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
meta/lib/oe/license_finder.py
View File

@ -14,16 +14,16 @@ import bb
logger = logging.getLogger("BitBake.OE.LicenseFinder") 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 bb.utils
import csv import csv
md5sums = {} md5sums = {}
if not static_only and not linenumbers:
# Gather md5sums of license files in common license dir # Gather md5sums of license files in common license dir
commonlicdir = d.getVar('COMMON_LICENSE_DIR') commonlicdir = d.getVar('COMMON_LICENSE_DIR')
for fn in os.listdir(commonlicdir): for fn in os.listdir(commonlicdir):
md5value = bb.utils.md5_file(os.path.join(commonlicdir, fn)) md5value = bb.utils.md5_file(os.path.join(commonlicdir, fn))
md5sums[md5value] = fn md5sums[md5value] = fn
# The following were extracted from common values in various recipes # The following were extracted from common values in various recipes
# (double checking the license against the license file itself, not just # (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') csv_path = os.path.join(path, 'files', 'license-hashes.csv')
if os.path.isfile(csv_path): if os.path.isfile(csv_path):
with open(csv_path, newline='') as csv_file: with open(csv_path, newline='') as csv_file:
fieldnames = ['md5sum', 'license', 'beginline', 'endline', 'md5'] reader = csv.DictReader(csv_file, delimiter=',', fieldnames=['md5sum', 'license'])
reader = csv.DictReader(csv_file, delimiter=',', fieldnames=fieldnames)
for row in reader: for row in reader:
if linenumbers: md5sums[row['md5sum']] = row['license']
md5sums[row['md5sum']] = (
row['license'], row['beginline'], row['endline'], row['md5'])
else:
md5sums[row['md5sum']] = row['license']
return md5sums return md5sums