diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-05-31 11:25:29 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-06-02 15:16:37 +0100 |
| commit | 701d8f975c89dc6753188fbcf9d4883650ba5b58 (patch) | |
| tree | 63a17f2532b0a3ffa29d3e271837b160906c9b00 | |
| parent | 5fa00564b047725541a5fed95b621f0202803345 (diff) | |
| download | openembedded-core-contrib-701d8f975c89dc6753188fbcf9d4883650ba5b58.tar.gz | |
create-spdx-2-2: Fix packagedata usage to work with SDK packages
There are two seperate PKGDATA_DIR directories, one for the target and one for
the SDK. Rather than fail when a package can't be found, try the SDK first.
We use a datastore copy to keep the code simple, rather than havng to parameterise
all the packagedata functions.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/create-spdx-2.2.bbclass | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/meta/classes/create-spdx-2.2.bbclass b/meta/classes/create-spdx-2.2.bbclass index f9cb3add38..b8728c5705 100644 --- a/meta/classes/create-spdx-2.2.bbclass +++ b/meta/classes/create-spdx-2.2.bbclass @@ -714,11 +714,16 @@ def collect_package_providers(d): deps.append((d.getVar("PN"), d.getVar("BB_HASHFILENAME"))) for dep_pn, dep_hashfn in deps: - recipe_data = oe.packagedata.read_pkgdata(dep_pn, d) + localdata = d + recipe_data = oe.packagedata.read_pkgdata(dep_pn, localdata) + if not recipe_data: + localdata = bb.data.createCopy(d) + localdata.setVar("PKGDATA_DIR", "${PKGDATA_DIR_SDK}") + recipe_data = oe.packagedata.read_pkgdata(dep_pn, localdata) for pkg in recipe_data.get("PACKAGES", "").split(): - pkg_data = oe.packagedata.read_subpkgdata_dict(pkg, d) + pkg_data = oe.packagedata.read_subpkgdata_dict(pkg, localdata) rprovides = set(n for n, _ in bb.utils.explode_dep_versions2(pkg_data.get("RPROVIDES", "")).items()) rprovides.add(pkg) |