diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-30 14:20:04 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-30 14:21:29 +0100 |
commit | 0d9e89371158c4c329eebab3bc6609250b4c86c0 (patch) | |
tree | 3bc4b02ee601a1a4be6f7cf8c33a60251bde9032 /meta/classes/icecc.bbclass | |
parent | bc386b89345d1a4c941744f911065d498028d9d3 (diff) | |
download | poky-0d9e89371158c4c329eebab3bc6609250b4c86c0.tar.gz |
Revert "meta: replace os.popen with subprocess.Popen"
This reverts commit e83d8e58a6b107eea87df0ec233a1bc932b2c6e as the conversion
is not correct. Its replacing readlines() calls which generate an array with
what are effectively strings. There are split("\n") calls missing in many
cases so this needs to be reverted until it gets fixed.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/icecc.bbclass')
-rw-r--r-- | meta/classes/icecc.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass index 64a182e523..ae74050f6b 100644 --- a/meta/classes/icecc.bbclass +++ b/meta/classes/icecc.bbclass | |||
@@ -54,7 +54,7 @@ def create_path(compilers, bb, d): | |||
54 | staging += "-kernel" | 54 | staging += "-kernel" |
55 | 55 | ||
56 | #check if the icecc path is set by the user | 56 | #check if the icecc path is set by the user |
57 | icecc = d.getVar('ICECC_PATH') or bb.process.run("which icecc")[0][:-1] | 57 | icecc = d.getVar('ICECC_PATH') or os.popen("which icecc").read()[:-1] |
58 | 58 | ||
59 | # Create the dir if necessary | 59 | # Create the dir if necessary |
60 | try: | 60 | try: |
@@ -151,9 +151,9 @@ def icc_path(bb,d): | |||
151 | 151 | ||
152 | def icc_get_tool(bb, d, tool): | 152 | def icc_get_tool(bb, d, tool): |
153 | if icc_is_native(bb, d): | 153 | if icc_is_native(bb, d): |
154 | return bb.process.run("which %s" % tool)[0][:-1] | 154 | return os.popen("which %s" % tool).read()[:-1] |
155 | elif icc_is_kernel(bb, d): | 155 | elif icc_is_kernel(bb, d): |
156 | return bb.process.run("which %s" % get_cross_kernel_cc(bb, d))[0][:-1] | 156 | return os.popen("which %s" % get_cross_kernel_cc(bb, d)).read()[:-1] |
157 | else: | 157 | else: |
158 | ice_dir = d.expand('${STAGING_BINDIR_TOOLCHAIN}') | 158 | ice_dir = d.expand('${STAGING_BINDIR_TOOLCHAIN}') |
159 | target_sys = d.expand('${TARGET_SYS}') | 159 | target_sys = d.expand('${TARGET_SYS}') |