bitbake: bitbake-layers/tinfoil: Catch up with status -> recpiecache rename
(Bitbake rev: 0a9cbe7a6a17c5df38cd442ee8650097d6bbf502) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
fe17af27ae
commit
f7afeeb759
|
@ -89,7 +89,7 @@ class Commands(cmd.Cmd):
|
||||||
for layerdir in self.bblayers:
|
for layerdir in self.bblayers:
|
||||||
layername = self.get_layer_name(layerdir)
|
layername = self.get_layer_name(layerdir)
|
||||||
layerpri = 0
|
layerpri = 0
|
||||||
for layer, _, regex, pri in self.bbhandler.cooker.status.bbfile_config_priorities:
|
for layer, _, regex, pri in self.bbhandler.cooker.recpiecache.bbfile_config_priorities:
|
||||||
if regex.match(os.path.join(layerdir, 'test')):
|
if regex.match(os.path.join(layerdir, 'test')):
|
||||||
layerpri = pri
|
layerpri = pri
|
||||||
break
|
break
|
||||||
|
@ -225,9 +225,9 @@ Options:
|
||||||
|
|
||||||
|
|
||||||
def list_recipes(self, title, pnspec, show_overlayed_only, show_same_ver_only, show_filenames, show_multi_provider_only):
|
def list_recipes(self, title, pnspec, show_overlayed_only, show_same_ver_only, show_filenames, show_multi_provider_only):
|
||||||
pkg_pn = self.bbhandler.cooker.status.pkg_pn
|
pkg_pn = self.bbhandler.cooker.recpiecache.pkg_pn
|
||||||
(latest_versions, preferred_versions) = bb.providers.findProviders(self.bbhandler.cooker.configuration.data, self.bbhandler.cooker.status, pkg_pn)
|
(latest_versions, preferred_versions) = bb.providers.findProviders(self.bbhandler.cooker.configuration.data, self.bbhandler.cooker.recpiecache, pkg_pn)
|
||||||
allproviders = bb.providers.allProviders(self.bbhandler.cooker.status)
|
allproviders = bb.providers.allProviders(self.bbhandler.cooker.recpiecache)
|
||||||
|
|
||||||
# Ensure we list skipped recipes
|
# Ensure we list skipped recipes
|
||||||
# We are largely guessing about PN, PV and the preferred version here,
|
# We are largely guessing about PN, PV and the preferred version here,
|
||||||
|
@ -426,7 +426,7 @@ build results (as the layer priority order has effectively changed).
|
||||||
# have come from)
|
# have come from)
|
||||||
first_regex = None
|
first_regex = None
|
||||||
layerdir = layers[0]
|
layerdir = layers[0]
|
||||||
for layername, pattern, regex, _ in self.bbhandler.cooker.status.bbfile_config_priorities:
|
for layername, pattern, regex, _ in self.bbhandler.cooker.recpiecache.bbfile_config_priorities:
|
||||||
if regex.match(os.path.join(layerdir, 'test')):
|
if regex.match(os.path.join(layerdir, 'test')):
|
||||||
first_regex = regex
|
first_regex = regex
|
||||||
break
|
break
|
||||||
|
@ -456,7 +456,7 @@ build results (as the layer priority order has effectively changed).
|
||||||
logger.warning("File %s does not match the flattened layer's BBFILES setting, you may need to edit conf/layer.conf or move the file elsewhere" % f1full)
|
logger.warning("File %s does not match the flattened layer's BBFILES setting, you may need to edit conf/layer.conf or move the file elsewhere" % f1full)
|
||||||
|
|
||||||
def get_file_layer(self, filename):
|
def get_file_layer(self, filename):
|
||||||
for layer, _, regex, _ in self.bbhandler.cooker.status.bbfile_config_priorities:
|
for layer, _, regex, _ in self.bbhandler.cooker.recpiecache.bbfile_config_priorities:
|
||||||
if regex.match(filename):
|
if regex.match(filename):
|
||||||
for layerdir in self.bblayers:
|
for layerdir in self.bblayers:
|
||||||
if regex.match(os.path.join(layerdir, 'test')) and re.match(layerdir, filename):
|
if regex.match(os.path.join(layerdir, 'test')) and re.match(layerdir, filename):
|
||||||
|
@ -464,7 +464,7 @@ build results (as the layer priority order has effectively changed).
|
||||||
return "?"
|
return "?"
|
||||||
|
|
||||||
def get_file_layerdir(self, filename):
|
def get_file_layerdir(self, filename):
|
||||||
for layer, _, regex, _ in self.bbhandler.cooker.status.bbfile_config_priorities:
|
for layer, _, regex, _ in self.bbhandler.cooker.recpiecache.bbfile_config_priorities:
|
||||||
if regex.match(filename):
|
if regex.match(filename):
|
||||||
for layerdir in self.bblayers:
|
for layerdir in self.bblayers:
|
||||||
if regex.match(os.path.join(layerdir, 'test')) and re.match(layerdir, filename):
|
if regex.match(os.path.join(layerdir, 'test')) and re.match(layerdir, filename):
|
||||||
|
|
|
@ -71,13 +71,13 @@ class Tinfoil:
|
||||||
self.logger.setLevel(logging.INFO)
|
self.logger.setLevel(logging.INFO)
|
||||||
sys.stderr.write("done.\n")
|
sys.stderr.write("done.\n")
|
||||||
|
|
||||||
self.cooker_data = self.cooker.status
|
self.cooker_data = self.cooker.recpiecache
|
||||||
|
|
||||||
def prepare(self, config_only = False):
|
def prepare(self, config_only = False):
|
||||||
if not self.cooker_data:
|
if not self.cooker_data:
|
||||||
if config_only:
|
if config_only:
|
||||||
self.cooker.parseConfiguration()
|
self.cooker.parseConfiguration()
|
||||||
self.cooker_data = self.cooker.status
|
self.cooker_data = self.cooker.recpiecache
|
||||||
else:
|
else:
|
||||||
self.parseRecipes()
|
self.parseRecipes()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue