Files
poky/bitbake/bin/bitbake-layers
Alexander Kanavin 17f1b80c06 bitbake: bitbake-layers: ensure tinfoil.shutdown() gets executed when tinfoil.prepare() fails
https://git.yoctoproject.org/poky/commit/bitbake/bin/bitbake-layers?id=f6de2b033d32c0f92f19f5a4a8c4c8874a00a8f7
erroneously moved tinfoil.prepare() out of try..finally block, where
'finally' contains a tinfoil.shutdown() call.

Without the shutdown, if there is an error in tinfoil.prepare() (such as parsing errors),
the tool locks up, as seen here:
https://valkyrie.yoctoproject.org/#/builders/71/builds/431

(Bitbake rev: 06b8a18339434be8f754e534dacb790a2c9cb91d)

Signed-off-by: Alexander Kanavin <alex@linutronix.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2024-11-21 12:16:28 +00:00

3.7 KiB
Executable File

#!/usr/bin/env python3

This script has subcommands which operate against your bitbake layers, either

displaying useful information, or acting against them.

See the help output for details on available commands.

Copyright (C) 2011 Mentor Graphics Corporation

Copyright (C) 2011-2015 Intel Corporation

SPDX-License-Identifier: GPL-2.0-only

import logging import os import sys import argparse import warnings warnings.simplefilter("default")

bindir = os.path.dirname(file) topdir = os.path.dirname(bindir) sys.path[0:0] = [os.path.join(topdir, 'lib')]

import bb.tinfoil import bb.msg

logger = bb.msg.logger_create('bitbake-layers', sys.stdout)

def main(): parser = argparse.ArgumentParser( description="BitBake layers utility", epilog="Use %(prog)s --help to get help on a specific command", add_help=False) parser.add_argument('-d', '--debug', help='Enable debug output', action='store_true') parser.add_argument('-q', '--quiet', help='Print only errors', action='store_true') parser.add_argument('-F', '--force', help='Forced execution: can be specified multiple times. -F will force add without recipe parse verification and -FF will additionally force the run withput layer parsing.', action='count', default=0) parser.add_argument('--color', choices=['auto', 'always', 'never'], default='auto', help='Colorize output (where %(metavar)s is %(choices)s)', metavar='COLOR')

global_args, unparsed_args = parser.parse_known_args()

# Help is added here rather than via add_help=True, as we don't want it to
# be handled by parse_known_args()
parser.add_argument('-h', '--help', action='help', default=argparse.SUPPRESS,
                    help='show this help message and exit')
subparsers = parser.add_subparsers(title='subcommands', metavar='<subcommand>')
subparsers.required = True

if global_args.debug:
    logger.setLevel(logging.DEBUG)
elif global_args.quiet:
    logger.setLevel(logging.ERROR)

# Need to re-run logger_create with color argument
# (will be the same logger since it has the same name)
bb.msg.logger_create('bitbake-layers', output=sys.stdout,
                     color=global_args.color,
                     level=logger.getEffectiveLevel())

plugins = []
tinfoil = bb.tinfoil.Tinfoil(tracking=True)
tinfoil.logger.setLevel(logger.getEffectiveLevel())
try:
    if global_args.force > 1:
        bbpaths = []
    else:
        tinfoil.prepare(True)
        bbpaths = tinfoil.config_data.getVar('BBPATH').split(':')

    for path in ([topdir] + bbpaths):
        pluginpath = os.path.join(path, 'lib', 'bblayers')
        bb.utils.load_plugins(logger, plugins, pluginpath)

    registered = False
    for plugin in plugins:
        if hasattr(plugin, 'tinfoil_init') and global_args.force <= 1:
            plugin.tinfoil_init(tinfoil)
        if hasattr(plugin, 'register_commands'):
            registered = True
            plugin.register_commands(subparsers)

    if not registered:
        logger.error("No commands registered - missing plugins?")
        sys.exit(1)

    args = parser.parse_args(unparsed_args, namespace=global_args)

    if getattr(args, 'parserecipes', False):
        tinfoil.config_data.disableTracking()
        tinfoil.parse_recipes()
        tinfoil.config_data.enableTracking()

    return args.func(args)
finally:
    tinfoil.shutdown()

if name == "main": try: ret = main() except bb.BBHandledException: ret = 1 except Exception: ret = 1 import traceback traceback.print_exc() sys.exit(ret)