diff options
| author | Jose Quaresma <quaresma.jose@gmail.com> | 2022-10-24 11:32:16 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-11-10 14:39:24 +0000 |
| commit | 541402f288067e69200dea2521ca200de6b580d1 (patch) | |
| tree | 1cacd142a4350528de27d1ccc03b62808abf0445 /meta/classes/kernel-yocto.bbclass | |
| parent | f18032b98caf2de68cf3271a84c784a1ce365004 (diff) | |
| download | poky-541402f288067e69200dea2521ca200de6b580d1.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: e09d98cb1f940119600f90045ed4525987f4f481)
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/classes/kernel-yocto.bbclass')
| -rw-r--r-- | meta/classes/kernel-yocto.bbclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index e8046bb8f6..82e792351f 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass | |||
| @@ -500,7 +500,7 @@ python do_config_analysis() { | |||
| 500 | try: | 500 | try: |
| 501 | analysis = subprocess.check_output(['symbol_why.py', '--dotconfig', '{}'.format( d.getVar('B') + '/.config' ), '--blame', c], cwd=s, env=env ).decode('utf-8') | 501 | analysis = subprocess.check_output(['symbol_why.py', '--dotconfig', '{}'.format( d.getVar('B') + '/.config' ), '--blame', c], cwd=s, env=env ).decode('utf-8') |
| 502 | except subprocess.CalledProcessError as e: | 502 | except subprocess.CalledProcessError as e: |
| 503 | bb.fatal( "config analysis failed: %s" % e.output.decode('utf-8')) | 503 | bb.fatal( "config analysis failed when running '%s': %s" % (" ".join(e.cmd), e.output.decode('utf-8'))) |
| 504 | 504 | ||
| 505 | outfile = d.getVar( 'CONFIG_ANALYSIS_FILE' ) | 505 | outfile = d.getVar( 'CONFIG_ANALYSIS_FILE' ) |
| 506 | 506 | ||
| @@ -508,7 +508,7 @@ python do_config_analysis() { | |||
| 508 | try: | 508 | try: |
| 509 | analysis = subprocess.check_output(['symbol_why.py', '--dotconfig', '{}'.format( d.getVar('B') + '/.config' ), '--summary', '--extended', '--sanity', c], cwd=s, env=env ).decode('utf-8') | 509 | analysis = subprocess.check_output(['symbol_why.py', '--dotconfig', '{}'.format( d.getVar('B') + '/.config' ), '--summary', '--extended', '--sanity', c], cwd=s, env=env ).decode('utf-8') |
| 510 | except subprocess.CalledProcessError as e: | 510 | except subprocess.CalledProcessError as e: |
| 511 | bb.fatal( "config analysis failed: %s" % e.output.decode('utf-8')) | 511 | bb.fatal( "config analysis failed when running '%s': %s" % (" ".join(e.cmd), e.output.decode('utf-8'))) |
| 512 | 512 | ||
| 513 | outfile = d.getVar( 'CONFIG_AUDIT_FILE' ) | 513 | outfile = d.getVar( 'CONFIG_AUDIT_FILE' ) |
| 514 | 514 | ||
| @@ -569,7 +569,7 @@ python do_kernel_configcheck() { | |||
| 569 | try: | 569 | try: |
| 570 | analysis = subprocess.check_output(['symbol_why.py', '--dotconfig', '{}'.format( d.getVar('B') + '/.config' ), '--mismatches', extra_params], cwd=s, env=env ).decode('utf-8') | 570 | analysis = subprocess.check_output(['symbol_why.py', '--dotconfig', '{}'.format( d.getVar('B') + '/.config' ), '--mismatches', extra_params], cwd=s, env=env ).decode('utf-8') |
| 571 | except subprocess.CalledProcessError as e: | 571 | except subprocess.CalledProcessError as e: |
| 572 | bb.fatal( "config analysis failed: %s" % e.output.decode('utf-8')) | 572 | bb.fatal( "config analysis failed when running '%s': %s" % (" ".join(e.cmd), e.output.decode('utf-8'))) |
| 573 | 573 | ||
| 574 | if analysis: | 574 | if analysis: |
| 575 | outfile = "{}/{}/cfg/mismatch.txt".format( s, kmeta ) | 575 | outfile = "{}/{}/cfg/mismatch.txt".format( s, kmeta ) |
| @@ -591,7 +591,7 @@ python do_kernel_configcheck() { | |||
| 591 | try: | 591 | try: |
| 592 | analysis = subprocess.check_output(['symbol_why.py', '--dotconfig', '{}'.format( d.getVar('B') + '/.config' ), '--invalid', extra_params], cwd=s, env=env ).decode('utf-8') | 592 | analysis = subprocess.check_output(['symbol_why.py', '--dotconfig', '{}'.format( d.getVar('B') + '/.config' ), '--invalid', extra_params], cwd=s, env=env ).decode('utf-8') |
| 593 | except subprocess.CalledProcessError as e: | 593 | except subprocess.CalledProcessError as e: |
| 594 | bb.fatal( "config analysis failed: %s" % e.output.decode('utf-8')) | 594 | bb.fatal( "config analysis failed when running '%s': %s" % (" ".join(e.cmd), e.output.decode('utf-8'))) |
| 595 | 595 | ||
| 596 | if analysis: | 596 | if analysis: |
| 597 | outfile = "{}/{}/cfg/invalid.txt".format(s,kmeta) | 597 | outfile = "{}/{}/cfg/invalid.txt".format(s,kmeta) |
| @@ -610,7 +610,7 @@ python do_kernel_configcheck() { | |||
| 610 | try: | 610 | try: |
| 611 | analysis = subprocess.check_output(['symbol_why.py', '--dotconfig', '{}'.format( d.getVar('B') + '/.config' ), '--sanity'], cwd=s, env=env ).decode('utf-8') | 611 | analysis = subprocess.check_output(['symbol_why.py', '--dotconfig', '{}'.format( d.getVar('B') + '/.config' ), '--sanity'], cwd=s, env=env ).decode('utf-8') |
| 612 | except subprocess.CalledProcessError as e: | 612 | except subprocess.CalledProcessError as e: |
| 613 | bb.fatal( "config analysis failed: %s" % e.output.decode('utf-8')) | 613 | bb.fatal( "config analysis failed when running '%s': %s" % (" ".join(e.cmd), e.output.decode('utf-8'))) |
| 614 | 614 | ||
| 615 | if analysis: | 615 | if analysis: |
| 616 | outfile = "{}/{}/cfg/redefinition.txt".format(s,kmeta) | 616 | outfile = "{}/{}/cfg/redefinition.txt".format(s,kmeta) |
