mirror of
https://git.yoctoproject.org/poky
synced 2026-05-01 06:32:11 +02:00
24f871c801
During the extensible SDK installation process the final step is to prepare the internal copy of the build system. This can take some time, especially if you have SDK_EXT_TYPE set to "minimal" (downloading sstate artifacts) and SDK_INCLUDE_PKGDATA set to "1" (restoring pkgdata for world). To make this a bit less painful, use BitBake's new quiet mode to display status during this operation so you have some idea of how it's progressing; instead of redirecting the output to preparing_build_system.log we grab the last console log and append it instead. One result of this change is that you get the errors printed on the console during normal output rather than this going to the preparing_build_system.log file first. In OE-Core revision 227d2cbf9e0b8c35fa6644e3d72e0699db9607fa, we changed to always print the contents of preparing_build_system.log on failure, but now at least the error contents of that log is duplicated. Besides, I intentionally didn't print out the contents of that log during normal usage because it's quite verbose - the bug that we were attempting to fix was about not getting this information when seeing failures in the automated tests, thus I've moved printing the log to the test handling code instead. Part of the implementation for [YOCTO #9613]. (From OE-Core rev: 0f7cb880c934b7871f3b8432f4f02603300f6129) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
73 lines
2.1 KiB
Python
73 lines
2.1 KiB
Python
#!/usr/bin/env python
|
|
|
|
# Prepare the build system within the extensible SDK
|
|
|
|
import sys
|
|
import os
|
|
import subprocess
|
|
import signal
|
|
|
|
def reenable_sigint():
|
|
signal.signal(signal.SIGINT, signal.SIG_DFL)
|
|
|
|
def run_command_interruptible(cmd):
|
|
"""
|
|
Run a command with output displayed on the console, but ensure any Ctrl+C is
|
|
processed only by the child process.
|
|
"""
|
|
signal.signal(signal.SIGINT, signal.SIG_IGN)
|
|
try:
|
|
ret = subprocess.call(cmd, shell=True, preexec_fn=reenable_sigint)
|
|
finally:
|
|
signal.signal(signal.SIGINT, signal.SIG_DFL)
|
|
return ret
|
|
|
|
def get_last_consolelog():
|
|
'''Return the most recent console log file'''
|
|
logdir = os.path.join(os.path.dirname(os.path.realpath(__file__)), 'tmp', 'log', 'cooker')
|
|
if os.path.exists(logdir):
|
|
mcdir = os.listdir(logdir)
|
|
if mcdir:
|
|
logdir = os.path.join(logdir, mcdir[0])
|
|
logfiles = [os.path.join(logdir, fn) for fn in os.listdir(logdir)]
|
|
logfiles.sort(key=os.path.getmtime)
|
|
if logfiles:
|
|
return os.path.join(logdir, logfiles[-1])
|
|
return None
|
|
|
|
def main():
|
|
if len(sys.argv) < 2:
|
|
print('Please specify output log file')
|
|
return 1
|
|
logfile = sys.argv[1]
|
|
if len(sys.argv) < 3:
|
|
sdk_targets = []
|
|
else:
|
|
sdk_targets = ' '.join(sys.argv[2:]).split()
|
|
if not sdk_targets:
|
|
# Just do a parse so the cache is primed
|
|
ret = run_command_interruptible('bitbake -p --quiet')
|
|
return ret
|
|
|
|
with open(logfile, 'a') as logf:
|
|
logf.write('Preparing SDK for %s...\n' % ', '.join(sdk_targets))
|
|
|
|
ret = run_command_interruptible('BB_SETSCENE_ENFORCE=1 bitbake --quiet %s' % ' '.join(sdk_targets))
|
|
lastlog = get_last_consolelog()
|
|
if lastlog:
|
|
with open(lastlog, 'r') as f:
|
|
for line in f:
|
|
logf.write(line)
|
|
if ret:
|
|
print('ERROR: SDK preparation failed: see %s' % logfile)
|
|
return ret
|
|
|
|
if __name__ == "__main__":
|
|
try:
|
|
ret = main()
|
|
except Exception:
|
|
ret = 1
|
|
import traceback
|
|
traceback.print_exc()
|
|
sys.exit(ret)
|