mirror of
https://git.yoctoproject.org/git/poky
synced 2026-01-01 13:58:04 +00:00
1a9e0997c8
This reverts commit 4fca9a07f2d6b0544977112672b786982d7bb8f2.
The default python handler is to ignore SIGPIPE errors yet by adding
this line, we see:
2020-09-23 22:10:20,325 - oe-selftest - INFO - recipetool.RecipetoolTests.test_recipetool_appendfile_subdir (subunit.RemotedTestCase)
2020-09-23 22:10:20,325 - oe-selftest - INFO - ... FAIL
2020-09-23 22:10:20,325 - oe-selftest - INFO - 11: 30/44 227/415 (14.85s) (recipetool.RecipetoolTests.test_recipetool_appendfile_subdir)
2020-09-23 22:10:20,325 - oe-selftest - INFO - testtools.testresult.real._StringException: Traceback (most recent call last):
File "/home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/meta/lib/oeqa/selftest/cases/recipetool.py", line 226, in test_recipetool_appendfile_subdir
_, output = self._try_recipetool_appendfile('selftest-recipetool-appendfile', '/usr/share/selftest-replaceme-subdir', self.testfile, '', expectedlines, ['testfile'])
File "/home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/meta/lib/oeqa/selftest/cases/recipetool.py", line 85, in _try_recipetool_appendfile
return self._try_recipetool_appendcmd(cmd, testrecipe, expectedfiles, expectedlines)
File "/home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/meta/lib/oeqa/selftest/cases/recipetool.py", line 49, in _try_recipetool_appendcmd
bbappendfile = self._check_bbappend(testrecipe, recipefile, self.templayerdir)
File "/home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/meta/lib/oeqa/selftest/cases/devtool.py", line 186, in _check_bbappend
result = runCmd('bitbake-layers show-appends', cwd=self.builddir)
File "/home/pokybuild/yocto-worker/oe-selftest-ubuntu/build/meta/lib/oeqa/utils/commands.py", line 201, in runCmd
raise AssertionError("Command '%s' returned non-zero exit status %d:\n%s" % (command, result.status, exc_output))
AssertionError: Command 'bitbake-layers show-appends' returned non-zero exit status 141:
NOTE: Reconnecting to bitbake server...
where status 141 is SIGPIPE.
We expect SIGPIPE not to be raised like this. I tried the commands in the original
commit to pipe through less with the change reverted and I don't see the error
shown. I therefore believe this is safe to revert.
(Bitbake rev: 94a18f1f2e51dd5d3928e6e0c17f2c19c8b5db49)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
101 lines
3.4 KiB
Python
Executable File
101 lines
3.4 KiB
Python
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
|
|
|
|
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 <subcommand> --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='Force add without recipe parse verification', action='store_true')
|
|
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:
|
|
tinfoil.prepare(True)
|
|
for path in ([topdir] +
|
|
tinfoil.config_data.getVar('BBPATH').split(':')):
|
|
pluginpath = os.path.join(path, 'lib', 'bblayers')
|
|
bb.utils.load_plugins(logger, plugins, pluginpath)
|
|
|
|
registered = False
|
|
for plugin in plugins:
|
|
if hasattr(plugin, 'register_commands'):
|
|
registered = True
|
|
plugin.register_commands(subparsers)
|
|
if hasattr(plugin, 'tinfoil_init'):
|
|
plugin.tinfoil_init(tinfoil)
|
|
|
|
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)
|