* [PATCH 0/2] cache: Set packages for skipped recipes
@ 2019-07-12 3:26 Robert Yang
2019-07-12 3:26 ` [PATCH 1/2] cache: Remove duplicated lines for provides and rprovides Robert Yang
2019-07-12 3:26 ` [PATCH 2/2] cache: Set packages for skipped recipes Robert Yang
0 siblings, 2 replies; 3+ messages in thread
From: Robert Yang @ 2019-07-12 3:26 UTC (permalink / raw)
To: bitbake-devel
The following changes since commit 80ab79168ede2786868cbd354f0950c949f73527:
gnome-themes-standard: remove (2019-07-11 09:32:50 +0100)
are available in the git repository at:
git://git.pokylinux.org/poky-contrib rbt/ccache
http://git.pokylinux.org/cgit.cgi//log/?h=rbt/ccache
Robert Yang (2):
cache: Remove duplicated lines for provides and rprovides
cache: Set packages for skipped recipes
bitbake/lib/bb/cache.py | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
--
2.7.4
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH 1/2] cache: Remove duplicated lines for provides and rprovides
2019-07-12 3:26 [PATCH 0/2] cache: Set packages for skipped recipes Robert Yang
@ 2019-07-12 3:26 ` Robert Yang
2019-07-12 3:26 ` [PATCH 2/2] cache: Set packages for skipped recipes Robert Yang
1 sibling, 0 replies; 3+ messages in thread
From: Robert Yang @ 2019-07-12 3:26 UTC (permalink / raw)
To: bitbake-devel
Whether skip or not, they are always set, so move the lines ahead to avoid
duplicated lines.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
bitbake/lib/bb/cache.py | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py
index 5fb2f17..62d43ee 100644
--- a/bitbake/lib/bb/cache.py
+++ b/bitbake/lib/bb/cache.py
@@ -83,12 +83,12 @@ class CoreRecipeInfo(RecipeInfoCommon):
self.appends = self.listvar('__BBAPPEND', metadata)
self.nocache = self.getvar('BB_DONT_CACHE', metadata)
+ self.provides = self.depvar('PROVIDES', metadata)
+ self.rprovides = self.depvar('RPROVIDES', metadata)
self.skipreason = self.getvar('__SKIPPED', metadata)
if self.skipreason:
self.pn = self.getvar('PN', metadata) or bb.parse.vars_from_file(filename,metadata)[0]
self.skipped = True
- self.provides = self.depvar('PROVIDES', metadata)
- self.rprovides = self.depvar('RPROVIDES', metadata)
return
self.tasks = metadata.getVar('__BBTASKS', False)
@@ -115,9 +115,7 @@ class CoreRecipeInfo(RecipeInfoCommon):
self.file_checksums = self.flaglist('file-checksums', self.tasks, metadata, True)
self.packages_dynamic = self.listvar('PACKAGES_DYNAMIC', metadata)
self.depends = self.depvar('DEPENDS', metadata)
- self.provides = self.depvar('PROVIDES', metadata)
self.rdepends = self.depvar('RDEPENDS', metadata)
- self.rprovides = self.depvar('RPROVIDES', metadata)
self.rrecommends = self.depvar('RRECOMMENDS', metadata)
self.rprovides_pkg = self.pkgvar('RPROVIDES', self.packages, metadata)
self.rdepends_pkg = self.pkgvar('RDEPENDS', self.packages, metadata)
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [PATCH 2/2] cache: Set packages for skipped recipes
2019-07-12 3:26 [PATCH 0/2] cache: Set packages for skipped recipes Robert Yang
2019-07-12 3:26 ` [PATCH 1/2] cache: Remove duplicated lines for provides and rprovides Robert Yang
@ 2019-07-12 3:26 ` Robert Yang
1 sibling, 0 replies; 3+ messages in thread
From: Robert Yang @ 2019-07-12 3:26 UTC (permalink / raw)
To: bitbake-devel
The provides and rprovides had been set for skipped recipes, packages are
similar to them (all of them provide something), so also set it. This makes it
easier to figure out the RDEPENDS issues, for example, lmsensors
(lmsensors_3.5.0.bb) RRECOMMENDS lmsensors-config-fancontrol
(lmsensors-config_1.0.bb), but lmsensors-config is skipped for some reasons,
then if we run:
$ bitbake lmsensors
ERROR: Nothing RPROVIDES 'lmsensors-config-fancontrol' (but /path/to/lmsensors_3.5.0.bb RDEPENDS on or otherwise requires it)
NOTE: Runtime target 'lmsensors-config-fancontrol' is unbuildable, removing...
Missing or unbuildable dependency chain was: ['lmsensors-config-fancontrol']
ERROR: Required build target 'lmsensors' has no buildable providers.
Missing or unbuildable dependency chain was: ['lmsensors', 'lmsensors-config-fancontrol']
We had no way to know who rprovides lmsensors-config-fancontrol, we can figure
it out by bitbake/contrib/dump_cache.py after this patch.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
bitbake/lib/bb/cache.py | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py
index 62d43ee..bec8ef7 100644
--- a/bitbake/lib/bb/cache.py
+++ b/bitbake/lib/bb/cache.py
@@ -85,19 +85,19 @@ class CoreRecipeInfo(RecipeInfoCommon):
self.provides = self.depvar('PROVIDES', metadata)
self.rprovides = self.depvar('RPROVIDES', metadata)
+ self.pn = self.getvar('PN', metadata) or bb.parse.vars_from_file(filename,metadata)[0]
+ self.packages = self.listvar('PACKAGES', metadata)
+ if not self.packages:
+ self.packages.append(self.pn)
+ self.packages_dynamic = self.listvar('PACKAGES_DYNAMIC', metadata)
+
self.skipreason = self.getvar('__SKIPPED', metadata)
if self.skipreason:
- self.pn = self.getvar('PN', metadata) or bb.parse.vars_from_file(filename,metadata)[0]
self.skipped = True
return
self.tasks = metadata.getVar('__BBTASKS', False)
- self.pn = self.getvar('PN', metadata)
- self.packages = self.listvar('PACKAGES', metadata)
- if not self.packages:
- self.packages.append(self.pn)
-
self.basetaskhashes = self.taskvar('BB_BASEHASH', self.tasks, metadata)
self.hashfilename = self.getvar('BB_HASHFILENAME', metadata)
@@ -113,7 +113,6 @@ class CoreRecipeInfo(RecipeInfoCommon):
self.stampclean = self.getvar('STAMPCLEAN', metadata)
self.stamp_extrainfo = self.flaglist('stamp-extra-info', self.tasks, metadata)
self.file_checksums = self.flaglist('file-checksums', self.tasks, metadata, True)
- self.packages_dynamic = self.listvar('PACKAGES_DYNAMIC', metadata)
self.depends = self.depvar('DEPENDS', metadata)
self.rdepends = self.depvar('RDEPENDS', metadata)
self.rrecommends = self.depvar('RRECOMMENDS', metadata)
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-07-12 3:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-12 3:26 [PATCH 0/2] cache: Set packages for skipped recipes Robert Yang
2019-07-12 3:26 ` [PATCH 1/2] cache: Remove duplicated lines for provides and rprovides Robert Yang
2019-07-12 3:26 ` [PATCH 2/2] cache: Set packages for skipped recipes Robert Yang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.