diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2019-07-12 11:26:14 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-07-15 09:31:48 +0100 |
commit | 68467cfb895fc69e505c8c10d60284b0c8a4fc80 (patch) | |
tree | cfc04ca5ce3f607284a56f32aaa0849c1175789e /bitbake | |
parent | e205bc60050bb7a8d2744e94c5de4f416c0486aa (diff) | |
download | poky-68467cfb895fc69e505c8c10d60284b0c8a4fc80.tar.gz |
bitbake: cache: Remove duplicated lines for provides and rprovides
Whether skip or not, they are always set, so move the lines ahead to avoid
duplicated lines.
(Bitbake rev: c1a8ebb8f83e5108b667f291c924fc2fbd2ac769)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rw-r--r-- | bitbake/lib/bb/cache.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/bitbake/lib/bb/cache.py b/bitbake/lib/bb/cache.py index 5fb2f17cda..62d43eee36 100644 --- a/bitbake/lib/bb/cache.py +++ b/bitbake/lib/bb/cache.py | |||
@@ -83,12 +83,12 @@ class CoreRecipeInfo(RecipeInfoCommon): | |||
83 | self.appends = self.listvar('__BBAPPEND', metadata) | 83 | self.appends = self.listvar('__BBAPPEND', metadata) |
84 | self.nocache = self.getvar('BB_DONT_CACHE', metadata) | 84 | self.nocache = self.getvar('BB_DONT_CACHE', metadata) |
85 | 85 | ||
86 | self.provides = self.depvar('PROVIDES', metadata) | ||
87 | self.rprovides = self.depvar('RPROVIDES', metadata) | ||
86 | self.skipreason = self.getvar('__SKIPPED', metadata) | 88 | self.skipreason = self.getvar('__SKIPPED', metadata) |
87 | if self.skipreason: | 89 | if self.skipreason: |
88 | self.pn = self.getvar('PN', metadata) or bb.parse.vars_from_file(filename,metadata)[0] | 90 | self.pn = self.getvar('PN', metadata) or bb.parse.vars_from_file(filename,metadata)[0] |
89 | self.skipped = True | 91 | self.skipped = True |
90 | self.provides = self.depvar('PROVIDES', metadata) | ||
91 | self.rprovides = self.depvar('RPROVIDES', metadata) | ||
92 | return | 92 | return |
93 | 93 | ||
94 | self.tasks = metadata.getVar('__BBTASKS', False) | 94 | self.tasks = metadata.getVar('__BBTASKS', False) |
@@ -115,9 +115,7 @@ class CoreRecipeInfo(RecipeInfoCommon): | |||
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) | 116 | self.packages_dynamic = self.listvar('PACKAGES_DYNAMIC', metadata) |
117 | self.depends = self.depvar('DEPENDS', metadata) | 117 | self.depends = self.depvar('DEPENDS', metadata) |
118 | self.provides = self.depvar('PROVIDES', metadata) | ||
119 | self.rdepends = self.depvar('RDEPENDS', metadata) | 118 | self.rdepends = self.depvar('RDEPENDS', metadata) |
120 | self.rprovides = self.depvar('RPROVIDES', metadata) | ||
121 | self.rrecommends = self.depvar('RRECOMMENDS', metadata) | 119 | self.rrecommends = self.depvar('RRECOMMENDS', metadata) |
122 | self.rprovides_pkg = self.pkgvar('RPROVIDES', self.packages, metadata) | 120 | self.rprovides_pkg = self.pkgvar('RPROVIDES', self.packages, metadata) |
123 | self.rdepends_pkg = self.pkgvar('RDEPENDS', self.packages, metadata) | 121 | self.rdepends_pkg = self.pkgvar('RDEPENDS', self.packages, metadata) |