diff options
Diffstat (limited to 'bitbake/lib/bblayers/query.py')
-rw-r--r-- | bitbake/lib/bblayers/query.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bitbake/lib/bblayers/query.py b/bitbake/lib/bblayers/query.py index ee1e7c8a1c..29491163c2 100644 --- a/bitbake/lib/bblayers/query.py +++ b/bitbake/lib/bblayers/query.py | |||
@@ -62,7 +62,7 @@ are overlayed will also be listed, with a " (skipped)" suffix. | |||
62 | # factor - however, each layer.conf is free to either prepend or append to | 62 | # factor - however, each layer.conf is free to either prepend or append to |
63 | # BBPATH (or indeed do crazy stuff with it). Thus the order in BBPATH might | 63 | # BBPATH (or indeed do crazy stuff with it). Thus the order in BBPATH might |
64 | # not be exactly the order present in bblayers.conf either. | 64 | # not be exactly the order present in bblayers.conf either. |
65 | bbpath = str(self.tinfoil.config_data.getVar('BBPATH', True)) | 65 | bbpath = str(self.tinfoil.config_data.getVar('BBPATH')) |
66 | overlayed_class_found = False | 66 | overlayed_class_found = False |
67 | for (classfile, classdirs) in classes.items(): | 67 | for (classfile, classdirs) in classes.items(): |
68 | if len(classdirs) > 1: | 68 | if len(classdirs) > 1: |
@@ -114,7 +114,7 @@ skipped recipes will also be listed, with a " (skipped)" suffix. | |||
114 | 114 | ||
115 | def list_recipes(self, title, pnspec, show_overlayed_only, show_same_ver_only, show_filenames, show_multi_provider_only, inherits): | 115 | def list_recipes(self, title, pnspec, show_overlayed_only, show_same_ver_only, show_filenames, show_multi_provider_only, inherits): |
116 | if inherits: | 116 | if inherits: |
117 | bbpath = str(self.tinfoil.config_data.getVar('BBPATH', True)) | 117 | bbpath = str(self.tinfoil.config_data.getVar('BBPATH')) |
118 | for classname in inherits: | 118 | for classname in inherits: |
119 | classfile = 'classes/%s.bbclass' % classname | 119 | classfile = 'classes/%s.bbclass' % classname |
120 | if not bb.utils.which(bbpath, classfile, history=False): | 120 | if not bb.utils.which(bbpath, classfile, history=False): |
@@ -158,7 +158,7 @@ skipped recipes will also be listed, with a " (skipped)" suffix. | |||
158 | logger.plain("%s:", pn) | 158 | logger.plain("%s:", pn) |
159 | logger.plain(" %s %s%s", layer.ljust(20), ver, skipped) | 159 | logger.plain(" %s %s%s", layer.ljust(20), ver, skipped) |
160 | 160 | ||
161 | global_inherit = (self.tinfoil.config_data.getVar('INHERIT', True) or "").split() | 161 | global_inherit = (self.tinfoil.config_data.getVar('INHERIT') or "").split() |
162 | cls_re = re.compile('classes/') | 162 | cls_re = re.compile('classes/') |
163 | 163 | ||
164 | preffiles = [] | 164 | preffiles = [] |
@@ -319,12 +319,12 @@ NOTE: .bbappend files can impact the dependencies. | |||
319 | ignore_layers = (args.ignore or '').split(',') | 319 | ignore_layers = (args.ignore or '').split(',') |
320 | 320 | ||
321 | pkg_fn = self.tinfoil.cooker_data.pkg_fn | 321 | pkg_fn = self.tinfoil.cooker_data.pkg_fn |
322 | bbpath = str(self.tinfoil.config_data.getVar('BBPATH', True)) | 322 | bbpath = str(self.tinfoil.config_data.getVar('BBPATH')) |
323 | self.require_re = re.compile(r"require\s+(.+)") | 323 | self.require_re = re.compile(r"require\s+(.+)") |
324 | self.include_re = re.compile(r"include\s+(.+)") | 324 | self.include_re = re.compile(r"include\s+(.+)") |
325 | self.inherit_re = re.compile(r"inherit\s+(.+)") | 325 | self.inherit_re = re.compile(r"inherit\s+(.+)") |
326 | 326 | ||
327 | global_inherit = (self.tinfoil.config_data.getVar('INHERIT', True) or "").split() | 327 | global_inherit = (self.tinfoil.config_data.getVar('INHERIT') or "").split() |
328 | 328 | ||
329 | # The bb's DEPENDS and RDEPENDS | 329 | # The bb's DEPENDS and RDEPENDS |
330 | for f in pkg_fn: | 330 | for f in pkg_fn: |