[oe-commits] [bitbake] 10/10: cache: Set packages for skipped recipes

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository bitbake.

commit b30d0094e38bd9dd92175cf2b7fab266b0dafed6
Author: Robert Yang <liezhi.yang at windriver.com>
AuthorDate: Fri Jul 12 11:26:15 2019 +0800

    cache: Set packages for skipped recipes
    
    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 at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 lib/bb/cache.py | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/lib/bb/cache.py b/lib/bb/cache.py
index 62d43ee..bec8ef7 100644
--- a/lib/bb/cache.py
+++ b/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)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.