summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max.kellermann@gmail.com>2018-09-24 10:05:55 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-27 23:39:28 +0100
commit9602c03e8701c972f544001415efa92877622f57 (patch)
treedd2f3e473f933e342f70d36cc1984597fb345170
parenteb39670fb2fe9735a1a0434c63b64ec66599f850 (diff)
downloadopenembedded-core-contrib-9602c03e8701c972f544001415efa92877622f57.tar.gz
openembedded-core-contrib-9602c03e8701c972f544001415efa92877622f57.tar.bz2
openembedded-core-contrib-9602c03e8701c972f544001415efa92877622f57.zip
kernel-yocto.bbclass: fix "referenced before assignment" error
If "scc --configs" fails, do_kernel_configcheck() crashes like this: 0338: try: 0339: configs = subprocess.check_output(['scc', '--configs', '-o', s + '/.kernel-meta'], env=env).decode('utf-8') 0340: except subprocess.CalledProcessError: *** 0341: bb.fatal( "Cannot gather config fragments for audit: %s" % configs) 0342: 0343: try: 0344: subprocess.check_call(['kconf_check', '--report', '-o', 0345: '%s/%s/cfg' % (s, kmeta), d.getVar('B') + '/.config', s, configs], cwd=s, env=env) Exception: UnboundLocalError: local variable 'configs' referenced before assignment This crash bug was introduced by commit 21de5cc43cfedc703e5bc0515507a6dae36afb74 Signed-off-by: Max Kellermann <max.kellermann@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/kernel-yocto.bbclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass
index 2ecd060093..496c8a7f68 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -337,8 +337,8 @@ python do_kernel_configcheck() {
try:
configs = subprocess.check_output(['scc', '--configs', '-o', s + '/.kernel-meta'], env=env).decode('utf-8')
- except subprocess.CalledProcessError:
- bb.fatal( "Cannot gather config fragments for audit: %s" % configs)
+ except subprocess.CalledProcessError as e:
+ bb.fatal( "Cannot gather config fragments for audit: %s" % e.output.decode("utf-8") )
try:
subprocess.check_call(['kconf_check', '--report', '-o',