summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2021-04-26 09:30:02 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-04-27 15:22:40 +0100
commit580089c76234f04ac046318fe5f9da65aacab9af (patch)
treec4568df302a9e4f89d8559e7c009015638a5f0ed
parent18cbfe6369200df6c712c94af28aa752f789e283 (diff)
downloadpoky-580089c76234f04ac046318fe5f9da65aacab9af.tar.gz
bitbake: cache: Make CoreRecipeInfo include rprovides_pkg for skipped recipes
This will be needed by SkippedPackage in the cooker. (Bitbake rev: 1026b2d29340945608111d19ac5c31f0fcf91851) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/bb/cache.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py
index 9e0c931a07..029753fea0 100644
--- a/bitbake/lib/bb/cache.py
+++ b/bitbake/lib/bb/cache.py
@@ -26,7 +26,7 @@ import re
26 26
27logger = logging.getLogger("BitBake.Cache") 27logger = logging.getLogger("BitBake.Cache")
28 28
29__cache_version__ = "153" 29__cache_version__ = "154"
30 30
31def getCacheFile(path, filename, mc, data_hash): 31def getCacheFile(path, filename, mc, data_hash):
32 mcspec = '' 32 mcspec = ''
@@ -94,6 +94,7 @@ class CoreRecipeInfo(RecipeInfoCommon):
94 if not self.packages: 94 if not self.packages:
95 self.packages.append(self.pn) 95 self.packages.append(self.pn)
96 self.packages_dynamic = self.listvar('PACKAGES_DYNAMIC', metadata) 96 self.packages_dynamic = self.listvar('PACKAGES_DYNAMIC', metadata)
97 self.rprovides_pkg = self.pkgvar('RPROVIDES', self.packages, metadata)
97 98
98 self.skipreason = self.getvar('__SKIPPED', metadata) 99 self.skipreason = self.getvar('__SKIPPED', metadata)
99 if self.skipreason: 100 if self.skipreason:
@@ -120,7 +121,6 @@ class CoreRecipeInfo(RecipeInfoCommon):
120 self.depends = self.depvar('DEPENDS', metadata) 121 self.depends = self.depvar('DEPENDS', metadata)
121 self.rdepends = self.depvar('RDEPENDS', metadata) 122 self.rdepends = self.depvar('RDEPENDS', metadata)
122 self.rrecommends = self.depvar('RRECOMMENDS', metadata) 123 self.rrecommends = self.depvar('RRECOMMENDS', metadata)
123 self.rprovides_pkg = self.pkgvar('RPROVIDES', self.packages, metadata)
124 self.rdepends_pkg = self.pkgvar('RDEPENDS', self.packages, metadata) 124 self.rdepends_pkg = self.pkgvar('RDEPENDS', self.packages, metadata)
125 self.rrecommends_pkg = self.pkgvar('RRECOMMENDS', self.packages, metadata) 125 self.rrecommends_pkg = self.pkgvar('RRECOMMENDS', self.packages, metadata)
126 self.inherits = self.getvar('__inherit_cache', metadata, expand=False) 126 self.inherits = self.getvar('__inherit_cache', metadata, expand=False)