diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-09 14:55:04 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-09 16:05:08 +0100 |
commit | b54339d63339c99f24845f69f49cd1fe996e6e7c (patch) | |
tree | 73b3da57a66ab4a0f6fa06a479efc5449126342f /meta/classes/kernel-yocto.bbclass | |
parent | d529c11fa512e7f06044378a7ec7137765ea8eb4 (diff) | |
download | poky-b54339d63339c99f24845f69f49cd1fe996e6e7c.tar.gz |
classes/lib: Fix getcmdstatus breakage
I mistakenly thought subprocess had getcmdstatus in python 2. It doesn't so lets
add a wrapper and have this work in both worlds.
(From OE-Core rev: 2253e9f12734c6e6aa489942b5e4628eca1fa29d)
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 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/kernel-yocto.bbclass b/meta/classes/kernel-yocto.bbclass index c81e70e678..d513ad2b63 100644 --- a/meta/classes/kernel-yocto.bbclass +++ b/meta/classes/kernel-yocto.bbclass | |||
@@ -254,7 +254,7 @@ do_kernel_configme() { | |||
254 | } | 254 | } |
255 | 255 | ||
256 | python do_kernel_configcheck() { | 256 | python do_kernel_configcheck() { |
257 | import re, string, sys, subprocess | 257 | import re, string, sys |
258 | 258 | ||
259 | bb.plain("NOTE: validating kernel config, see log.do_kernel_configcheck for details") | 259 | bb.plain("NOTE: validating kernel config, see log.do_kernel_configcheck for details") |
260 | 260 | ||
@@ -265,7 +265,7 @@ python do_kernel_configcheck() { | |||
265 | 265 | ||
266 | pathprefix = "export PATH=%s:%s; " % (d.getVar('PATH', True), "${S}/scripts/util/") | 266 | pathprefix = "export PATH=%s:%s; " % (d.getVar('PATH', True), "${S}/scripts/util/") |
267 | cmd = d.expand("cd ${S}; kconf_check -config- %s/meta-series ${S} ${B}" % kmeta) | 267 | cmd = d.expand("cd ${S}; kconf_check -config- %s/meta-series ${S} ${B}" % kmeta) |
268 | ret, result = subprocess.getstatusoutput("%s%s" % (pathprefix, cmd)) | 268 | ret, result = oe.utils.getstatusoutput("%s%s" % (pathprefix, cmd)) |
269 | 269 | ||
270 | config_check_visibility = d.getVar( "KCONF_AUDIT_LEVEL", True ) or 1 | 270 | config_check_visibility = d.getVar( "KCONF_AUDIT_LEVEL", True ) or 1 |
271 | if config_check_visibility == 1: | 271 | if config_check_visibility == 1: |