summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe
diff options
context:
space:
mode:
Diffstat (limited to 'meta/lib/oe')
-rw-r--r--meta/lib/oe/__init__.py2
-rw-r--r--meta/lib/oe/spdx_common.py8
2 files changed, 7 insertions, 3 deletions
diff --git a/meta/lib/oe/__init__.py b/meta/lib/oe/__init__.py
index d760481283..3179a3f3d2 100644
--- a/meta/lib/oe/__init__.py
+++ b/meta/lib/oe/__init__.py
@@ -11,4 +11,4 @@ __path__ = extend_path(__path__, __name__)
11# processed correctly (e.g. qa) 11# processed correctly (e.g. qa)
12BBIMPORTS = ["qa", "data", "path", "utils", "types", "package", "packagedata", \ 12BBIMPORTS = ["qa", "data", "path", "utils", "types", "package", "packagedata", \
13 "packagegroup", "sstatesig", "lsb", "cachedpath", "license", \ 13 "packagegroup", "sstatesig", "lsb", "cachedpath", "license", \
14 "reproducible", "rust", "buildcfg", "go"] 14 "reproducible", "rust", "buildcfg", "go", "spdx30_tasks", "spdx_common"]
diff --git a/meta/lib/oe/spdx_common.py b/meta/lib/oe/spdx_common.py
index 23a17271d6..e1b26edaaf 100644
--- a/meta/lib/oe/spdx_common.py
+++ b/meta/lib/oe/spdx_common.py
@@ -12,7 +12,7 @@ import re
12import shutil 12import shutil
13 13
14from pathlib import Path 14from pathlib import Path
15 15from dataclasses import dataclass
16 16
17LIC_REGEX = re.compile( 17LIC_REGEX = re.compile(
18 rb"^\W*SPDX-License-Identifier:\s*([ \w\d.()+-]+?)(?:\s+\W*)?$", 18 rb"^\W*SPDX-License-Identifier:\s*([ \w\d.()+-]+?)(?:\s+\W*)?$",
@@ -77,7 +77,11 @@ def process_sources(d):
77 return True 77 return True
78 78
79 79
80Dep = collections.namedtuple("Dep", ["pn", "hashfn", "in_taskhash"]) 80@dataclass(frozen=True)
81class Dep(object):
82 pn: str
83 hashfn: str
84 in_taskhash: bool
81 85
82 86
83def collect_direct_deps(d, dep_task): 87def collect_direct_deps(d, dep_task):