diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2020-12-07 22:38:51 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-12-21 22:29:57 +0000 |
commit | b66ff692942305d630f52f367d4bd9ed3330a3cf (patch) | |
tree | 562cd1ca0e3eae8ff997b32d3cabc655518ca446 /bitbake/lib | |
parent | 8939086648f2129b08e1971afbab597d1217a331 (diff) | |
download | poky-b66ff692942305d630f52f367d4bd9ed3330a3cf.tar.gz |
bitbake: cooker: Include all packages a recipe provides in SkippedPackage.rprovides
The provided packages by a skipped recipe are supposed to be listed in
SkippedPackage.rprovides, which is used when generating a meaningful
error message when a build fails because of a skipped package.
Previously this variable only contained the contents of ${RPROVIDES}.
However, most recipes don't define RPROVIDES, they define
RPROVIDES_<pkg> for each package they provide. Additionally, the recipe
provides the packages in PACKAGES without them being included in
${RPROVIDES}.
Before this change, having a runtime dependency on a skipped non-recipe
package would result in a build error stating that the build failed
because the package was skipped, but without providing any reason for
why it was skipped.
(Bitbake rev: efd026c26a377b826a49b945a8212bf7de8a480a)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r-- | bitbake/lib/bb/cooker.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 1f4cc1e96d..83cfee7fb4 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -73,7 +73,9 @@ class SkippedPackage: | |||
73 | self.pn = info.pn | 73 | self.pn = info.pn |
74 | self.skipreason = info.skipreason | 74 | self.skipreason = info.skipreason |
75 | self.provides = info.provides | 75 | self.provides = info.provides |
76 | self.rprovides = info.rprovides | 76 | self.rprovides = info.packages + info.rprovides |
77 | for package in info.packages: | ||
78 | self.rprovides += info.rprovides_pkg[package] | ||
77 | elif reason: | 79 | elif reason: |
78 | self.skipreason = reason | 80 | self.skipreason = reason |
79 | 81 | ||