diff options
-rw-r--r-- | bitbake/lib/bb/cache.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py index 62d43eee36..bec8ef7757 100644 --- a/bitbake/lib/bb/cache.py +++ b/bitbake/lib/bb/cache.py | |||
@@ -85,19 +85,19 @@ class CoreRecipeInfo(RecipeInfoCommon): | |||
85 | 85 | ||
86 | self.provides = self.depvar('PROVIDES', metadata) | 86 | self.provides = self.depvar('PROVIDES', metadata) |
87 | self.rprovides = self.depvar('RPROVIDES', metadata) | 87 | self.rprovides = self.depvar('RPROVIDES', metadata) |
88 | self.pn = self.getvar('PN', metadata) or bb.parse.vars_from_file(filename,metadata)[0] | ||
89 | self.packages = self.listvar('PACKAGES', metadata) | ||
90 | if not self.packages: | ||
91 | self.packages.append(self.pn) | ||
92 | self.packages_dynamic = self.listvar('PACKAGES_DYNAMIC', metadata) | ||
93 | |||
88 | self.skipreason = self.getvar('__SKIPPED', metadata) | 94 | self.skipreason = self.getvar('__SKIPPED', metadata) |
89 | if self.skipreason: | 95 | if self.skipreason: |
90 | self.pn = self.getvar('PN', metadata) or bb.parse.vars_from_file(filename,metadata)[0] | ||
91 | self.skipped = True | 96 | self.skipped = True |
92 | return | 97 | return |
93 | 98 | ||
94 | self.tasks = metadata.getVar('__BBTASKS', False) | 99 | self.tasks = metadata.getVar('__BBTASKS', False) |
95 | 100 | ||
96 | self.pn = self.getvar('PN', metadata) | ||
97 | self.packages = self.listvar('PACKAGES', metadata) | ||
98 | if not self.packages: | ||
99 | self.packages.append(self.pn) | ||
100 | |||
101 | self.basetaskhashes = self.taskvar('BB_BASEHASH', self.tasks, metadata) | 101 | self.basetaskhashes = self.taskvar('BB_BASEHASH', self.tasks, metadata) |
102 | self.hashfilename = self.getvar('BB_HASHFILENAME', metadata) | 102 | self.hashfilename = self.getvar('BB_HASHFILENAME', metadata) |
103 | 103 | ||
@@ -113,7 +113,6 @@ class CoreRecipeInfo(RecipeInfoCommon): | |||
113 | self.stampclean = self.getvar('STAMPCLEAN', metadata) | 113 | self.stampclean = self.getvar('STAMPCLEAN', metadata) |
114 | self.stamp_extrainfo = self.flaglist('stamp-extra-info', self.tasks, metadata) | 114 | self.stamp_extrainfo = self.flaglist('stamp-extra-info', self.tasks, metadata) |
115 | self.file_checksums = self.flaglist('file-checksums', self.tasks, metadata, True) | 115 | self.file_checksums = self.flaglist('file-checksums', self.tasks, metadata, True) |
116 | self.packages_dynamic = self.listvar('PACKAGES_DYNAMIC', metadata) | ||
117 | self.depends = self.depvar('DEPENDS', metadata) | 116 | self.depends = self.depvar('DEPENDS', metadata) |
118 | self.rdepends = self.depvar('RDEPENDS', metadata) | 117 | self.rdepends = self.depvar('RDEPENDS', metadata) |
119 | self.rrecommends = self.depvar('RRECOMMENDS', metadata) | 118 | self.rrecommends = self.depvar('RRECOMMENDS', metadata) |