diff options
Diffstat (limited to 'bitbake/bin')
-rwxr-xr-x | bitbake/bin/bitbake-getvar | 48 | ||||
-rwxr-xr-x | bitbake/bin/bitbake-worker | 14 |
2 files changed, 56 insertions, 6 deletions
diff --git a/bitbake/bin/bitbake-getvar b/bitbake/bin/bitbake-getvar new file mode 100755 index 0000000000..9423219253 --- /dev/null +++ b/bitbake/bin/bitbake-getvar | |||
@@ -0,0 +1,48 @@ | |||
1 | #! /usr/bin/env python3 | ||
2 | # | ||
3 | # Copyright (C) 2021 Richard Purdie | ||
4 | # | ||
5 | # SPDX-License-Identifier: GPL-2.0-only | ||
6 | # | ||
7 | |||
8 | import argparse | ||
9 | import io | ||
10 | import os | ||
11 | import sys | ||
12 | |||
13 | bindir = os.path.dirname(__file__) | ||
14 | topdir = os.path.dirname(bindir) | ||
15 | sys.path[0:0] = [os.path.join(topdir, 'lib')] | ||
16 | |||
17 | import bb.tinfoil | ||
18 | |||
19 | if __name__ == "__main__": | ||
20 | parser = argparse.ArgumentParser(description="Bitbake Query Variable") | ||
21 | parser.add_argument("variable", help="variable name to query") | ||
22 | parser.add_argument("-r", "--recipe", help="Recipe name to query", default=None, required=False) | ||
23 | parser.add_argument('-u', '--unexpand', help='Do not expand the value (with --value)', action="store_true") | ||
24 | parser.add_argument('-f', '--flag', help='Specify a variable flag to query (with --value)', default=None) | ||
25 | parser.add_argument('--value', help='Only report the value, no history and no variable name', action="store_true") | ||
26 | args = parser.parse_args() | ||
27 | |||
28 | if args.unexpand and not args.value: | ||
29 | print("--unexpand only makes sense with --value") | ||
30 | sys.exit(1) | ||
31 | |||
32 | if args.flag and not args.value: | ||
33 | print("--flag only makes sense with --value") | ||
34 | sys.exit(1) | ||
35 | |||
36 | with bb.tinfoil.Tinfoil(tracking=True) as tinfoil: | ||
37 | if args.recipe: | ||
38 | tinfoil.prepare(quiet=2) | ||
39 | d = tinfoil.parse_recipe(args.recipe) | ||
40 | else: | ||
41 | tinfoil.prepare(quiet=2, config_only=True) | ||
42 | d = tinfoil.config_data | ||
43 | if args.flag: | ||
44 | print(str(d.getVarFlag(args.variable, args.flag, expand=(not args.unexpand)))) | ||
45 | elif args.value: | ||
46 | print(str(d.getVar(args.variable, expand=(not args.unexpand)))) | ||
47 | else: | ||
48 | bb.data.emit_var(args.variable, d=d, all=True) | ||
diff --git a/bitbake/bin/bitbake-worker b/bitbake/bin/bitbake-worker index 97cc0fd60f..e3ce01eec8 100755 --- a/bitbake/bin/bitbake-worker +++ b/bitbake/bin/bitbake-worker | |||
@@ -413,9 +413,9 @@ class BitbakeWorker(object): | |||
413 | 413 | ||
414 | def handle_workerdata(self, data): | 414 | def handle_workerdata(self, data): |
415 | self.workerdata = pickle.loads(data) | 415 | self.workerdata = pickle.loads(data) |
416 | bb.build.verboseShellLogging = self.workerdata["build_verbose_shell"] | ||
417 | bb.build.verboseStdoutLogging = self.workerdata["build_verbose_stdout"] | ||
416 | bb.msg.loggerDefaultLogLevel = self.workerdata["logdefaultlevel"] | 418 | bb.msg.loggerDefaultLogLevel = self.workerdata["logdefaultlevel"] |
417 | bb.msg.loggerDefaultVerbose = self.workerdata["logdefaultverbose"] | ||
418 | bb.msg.loggerVerboseLogs = self.workerdata["logdefaultverboselogs"] | ||
419 | bb.msg.loggerDefaultDomains = self.workerdata["logdefaultdomain"] | 419 | bb.msg.loggerDefaultDomains = self.workerdata["logdefaultdomain"] |
420 | for mc in self.databuilder.mcdata: | 420 | for mc in self.databuilder.mcdata: |
421 | self.databuilder.mcdata[mc].setVar("PRSERV_HOST", self.workerdata["prhost"]) | 421 | self.databuilder.mcdata[mc].setVar("PRSERV_HOST", self.workerdata["prhost"]) |
@@ -505,9 +505,11 @@ except BaseException as e: | |||
505 | import traceback | 505 | import traceback |
506 | sys.stderr.write(traceback.format_exc()) | 506 | sys.stderr.write(traceback.format_exc()) |
507 | sys.stderr.write(str(e)) | 507 | sys.stderr.write(str(e)) |
508 | finally: | ||
509 | worker_thread_exit = True | ||
510 | worker_thread.join() | ||
508 | 511 | ||
509 | worker_thread_exit = True | 512 | workerlog_write("exiting") |
510 | worker_thread.join() | 513 | if not normalexit: |
511 | 514 | sys.exit(1) | |
512 | workerlog_write("exitting") | ||
513 | sys.exit(0) | 515 | sys.exit(0) |