diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2014-05-23 16:22:15 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-28 08:29:18 +0100 |
commit | 603f3fbe984a9b7d8ef55a2e93326329855faf76 (patch) | |
tree | d8c103e799b56d1aa9662305060c0ed1e0c6c444 /bitbake | |
parent | e124c0f9a848b8eacd91ec2dabe2fe97a07a02ba (diff) | |
download | poky-603f3fbe984a9b7d8ef55a2e93326329855faf76.tar.gz |
bitbake: bitbake-layers: show-cross-depends: ignore global inherits
It's not particularly useful to show globally inherited classes here
since they do not normally represent a dependency.
(Bitbake rev: d16948bb88fcf44d861985838030be7c08697963)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rwxr-xr-x | bitbake/bin/bitbake-layers | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/bitbake/bin/bitbake-layers b/bitbake/bin/bitbake-layers index 826a3e7a57..326239a6a0 100755 --- a/bitbake/bin/bitbake-layers +++ b/bitbake/bin/bitbake-layers | |||
@@ -596,6 +596,8 @@ The .bbappend file can impact the dependency. | |||
596 | self.include_re = re.compile(r"include\s+(.+)") | 596 | self.include_re = re.compile(r"include\s+(.+)") |
597 | self.inherit_re = re.compile(r"inherit\s+(.+)") | 597 | self.inherit_re = re.compile(r"inherit\s+(.+)") |
598 | 598 | ||
599 | global_inherit = (self.bbhandler.config_data.getVar('INHERIT', True) or "").split() | ||
600 | |||
599 | # The bb's DEPENDS and RDEPENDS | 601 | # The bb's DEPENDS and RDEPENDS |
600 | for f in pkg_fn: | 602 | for f in pkg_fn: |
601 | f = bb.cache.Cache.virtualfn2realfn(f)[0] | 603 | f = bb.cache.Cache.virtualfn2realfn(f)[0] |
@@ -637,6 +639,9 @@ The .bbappend file can impact the dependency. | |||
637 | # The inherits' format is [classes/cls, /path/to/classes/cls] | 639 | # The inherits' format is [classes/cls, /path/to/classes/cls] |
638 | # ignore the classes/cls. | 640 | # ignore the classes/cls. |
639 | if not cls_re.match(cls): | 641 | if not cls_re.match(cls): |
642 | classname = os.path.splitext(os.path.basename(cls))[0] | ||
643 | if classname in global_inherit: | ||
644 | continue | ||
640 | inherit_layername = self.get_file_layer(cls) | 645 | inherit_layername = self.get_file_layer(cls) |
641 | if inherit_layername != layername and not inherit_layername in ignore_layers: | 646 | if inherit_layername != layername and not inherit_layername in ignore_layers: |
642 | if not options.show_filenames: | 647 | if not options.show_filenames: |