summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJose Quaresma <quaresma.jose@gmail.com>2022-10-24 11:32:16 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-11-09 17:42:14 +0000
commitd18ec217b3c38e0a206f6d6e3749c1cd9f0df8ab (patch)
treeec46de8846e9cd646124de8820bf40d368165cf7 /meta
parent0771c25330be3f1ae64c800d0f9a9efa277b4602 (diff)
downloadpoky-d18ec217b3c38e0a206f6d6e3749c1cd9f0df8ab.tar.gz
kernel-yocto: improve fatal error messages of symbol_why.py
Improve the fatal error message of the yocto-kernel-tools symbol_why.py and shows the command that generate the error as it can help understand the root cause of the error. (From OE-Core rev: 97cb48ce09d80e5496e4f887a8cf02125c66c6c5) Signed-off-by: Jose Quaresma <jose.quaresma@foundries.io> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> (cherry picked from commit 54ae08779071f2e97bff0ff6514ede3124312c3b) Signed-off-by: Steve Sakoman <steve@sakoman.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes-recipe/kernel-yocto.bbclass10
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes-recipe/kernel-yocto.bbclass b/meta/classes-recipe/kernel-yocto.bbclass
index 8eda0dcaf3..1a6695ba7e 100644
--- a/meta/classes-recipe/kernel-yocto.bbclass
+++ b/meta/classes-recipe/kernel-yocto.bbclass
@@ -506,7 +506,7 @@ python do_config_analysis() {
506 try: 506 try:
507 analysis = subprocess.check_output(['symbol_why.py', '--dotconfig', '{}'.format( d.getVar('B') + '/.config' ), '--blame', c], cwd=s, env=env ).decode('utf-8') 507 analysis = subprocess.check_output(['symbol_why.py', '--dotconfig', '{}'.format( d.getVar('B') + '/.config' ), '--blame', c], cwd=s, env=env ).decode('utf-8')
508 except subprocess.CalledProcessError as e: 508 except subprocess.CalledProcessError as e:
509 bb.fatal( "config analysis failed: %s" % e.output.decode('utf-8')) 509 bb.fatal( "config analysis failed when running '%s': %s" % (" ".join(e.cmd), e.output.decode('utf-8')))
510 510
511 outfile = d.getVar( 'CONFIG_ANALYSIS_FILE' ) 511 outfile = d.getVar( 'CONFIG_ANALYSIS_FILE' )
512 512
@@ -514,7 +514,7 @@ python do_config_analysis() {
514 try: 514 try:
515 analysis = subprocess.check_output(['symbol_why.py', '--dotconfig', '{}'.format( d.getVar('B') + '/.config' ), '--summary', '--extended', '--sanity', c], cwd=s, env=env ).decode('utf-8') 515 analysis = subprocess.check_output(['symbol_why.py', '--dotconfig', '{}'.format( d.getVar('B') + '/.config' ), '--summary', '--extended', '--sanity', c], cwd=s, env=env ).decode('utf-8')
516 except subprocess.CalledProcessError as e: 516 except subprocess.CalledProcessError as e:
517 bb.fatal( "config analysis failed: %s" % e.output.decode('utf-8')) 517 bb.fatal( "config analysis failed when running '%s': %s" % (" ".join(e.cmd), e.output.decode('utf-8')))
518 518
519 outfile = d.getVar( 'CONFIG_AUDIT_FILE' ) 519 outfile = d.getVar( 'CONFIG_AUDIT_FILE' )
520 520
@@ -575,7 +575,7 @@ python do_kernel_configcheck() {
575 try: 575 try:
576 analysis = subprocess.check_output(['symbol_why.py', '--dotconfig', '{}'.format( d.getVar('B') + '/.config' ), '--mismatches', extra_params], cwd=s, env=env ).decode('utf-8') 576 analysis = subprocess.check_output(['symbol_why.py', '--dotconfig', '{}'.format( d.getVar('B') + '/.config' ), '--mismatches', extra_params], cwd=s, env=env ).decode('utf-8')
577 except subprocess.CalledProcessError as e: 577 except subprocess.CalledProcessError as e:
578 bb.fatal( "config analysis failed: %s" % e.output.decode('utf-8')) 578 bb.fatal( "config analysis failed when running '%s': %s" % (" ".join(e.cmd), e.output.decode('utf-8')))
579 579
580 if analysis: 580 if analysis:
581 outfile = "{}/{}/cfg/mismatch.txt".format( s, kmeta ) 581 outfile = "{}/{}/cfg/mismatch.txt".format( s, kmeta )
@@ -597,7 +597,7 @@ python do_kernel_configcheck() {
597 try: 597 try:
598 analysis = subprocess.check_output(['symbol_why.py', '--dotconfig', '{}'.format( d.getVar('B') + '/.config' ), '--invalid', extra_params], cwd=s, env=env ).decode('utf-8') 598 analysis = subprocess.check_output(['symbol_why.py', '--dotconfig', '{}'.format( d.getVar('B') + '/.config' ), '--invalid', extra_params], cwd=s, env=env ).decode('utf-8')
599 except subprocess.CalledProcessError as e: 599 except subprocess.CalledProcessError as e:
600 bb.fatal( "config analysis failed: %s" % e.output.decode('utf-8')) 600 bb.fatal( "config analysis failed when running '%s': %s" % (" ".join(e.cmd), e.output.decode('utf-8')))
601 601
602 if analysis: 602 if analysis:
603 outfile = "{}/{}/cfg/invalid.txt".format(s,kmeta) 603 outfile = "{}/{}/cfg/invalid.txt".format(s,kmeta)
@@ -616,7 +616,7 @@ python do_kernel_configcheck() {
616 try: 616 try:
617 analysis = subprocess.check_output(['symbol_why.py', '--dotconfig', '{}'.format( d.getVar('B') + '/.config' ), '--sanity'], cwd=s, env=env ).decode('utf-8') 617 analysis = subprocess.check_output(['symbol_why.py', '--dotconfig', '{}'.format( d.getVar('B') + '/.config' ), '--sanity'], cwd=s, env=env ).decode('utf-8')
618 except subprocess.CalledProcessError as e: 618 except subprocess.CalledProcessError as e:
619 bb.fatal( "config analysis failed: %s" % e.output.decode('utf-8')) 619 bb.fatal( "config analysis failed when running '%s': %s" % (" ".join(e.cmd), e.output.decode('utf-8')))
620 620
621 if analysis: 621 if analysis:
622 outfile = "{}/{}/cfg/redefinition.txt".format(s,kmeta) 622 outfile = "{}/{}/cfg/redefinition.txt".format(s,kmeta)