diff options
author | Michael Ho <Michael.Ho@bmw.de> | 2021-01-12 09:55:33 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-13 23:13:46 +0000 |
commit | 19cdf6b35902601b1e30c8cb9a4df7e217d687d4 (patch) | |
tree | bfa355c40c0f5cb73475c6e3eee8f9ed06b98a33 /meta/classes | |
parent | e5b5c38a76bbf3f56353954bdc65fa8736ed76bf (diff) | |
download | poky-19cdf6b35902601b1e30c8cb9a4df7e217d687d4.tar.gz |
license_image.bbclass: fix missing recipeinfo on self
Resolve a build bug where image recipes with a do_deploy task will fail.
If the image recipe inheriting license_image.bbclass has a deploy task, then
the function get_deployed_dependencies will add itself to the list of recipes
to get license information for.
However, image recipes don't generally deploy license info so this results in
an error.
File: '/nvme/poky/meta/classes/license_image.bbclass', lineno: 192, function: license_deployed_manifest
...
Exception: FileNotFoundError: [Errno 2] No such file or directory: '/nvme/poky/build/tmp/deploy/licenses/core-image-minimal/recipeinfo'
Add a corner case to exclude the originating image recipe from the list of
dependencies to check.
(From OE-Core rev: 13fb39e49e55a0bc7c78b0bfdc372163b3f9e70a)
Signed-off-by: Michael Ho <Michael.Ho@bmw.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/license_image.bbclass | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/license_image.bbclass b/meta/classes/license_image.bbclass index 119c8dfc86..8fd88cfb2d 100644 --- a/meta/classes/license_image.bbclass +++ b/meta/classes/license_image.bbclass | |||
@@ -220,9 +220,10 @@ def get_deployed_dependencies(d): | |||
220 | deploy = {} | 220 | deploy = {} |
221 | # Get all the dependencies for the current task (rootfs). | 221 | # Get all the dependencies for the current task (rootfs). |
222 | taskdata = d.getVar("BB_TASKDEPDATA", False) | 222 | taskdata = d.getVar("BB_TASKDEPDATA", False) |
223 | pn = d.getVar("PN", True) | ||
223 | depends = list(set([dep[0] for dep | 224 | depends = list(set([dep[0] for dep |
224 | in list(taskdata.values()) | 225 | in list(taskdata.values()) |
225 | if not dep[0].endswith("-native")])) | 226 | if not dep[0].endswith("-native") and not dep[0] == pn])) |
226 | 227 | ||
227 | # To verify what was deployed it checks the rootfs dependencies against | 228 | # To verify what was deployed it checks the rootfs dependencies against |
228 | # the SSTATE_MANIFESTS for "deploy" task. | 229 | # the SSTATE_MANIFESTS for "deploy" task. |