diff options
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/staging.bbclass | 6 | ||||
| -rw-r--r-- | meta/classes/testsdk.bbclass | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/meta/classes/staging.bbclass b/meta/classes/staging.bbclass index c479bd93ea..1b9e84d97e 100644 --- a/meta/classes/staging.bbclass +++ b/meta/classes/staging.bbclass @@ -171,7 +171,7 @@ def staging_processfixme(fixme, target, recipesysroot, recipesysrootnative, d): fixme_path = d.getVar(fixmevar) cmd += " -e 's:FIXME_%s:%s:g'" % (fixmevar, fixme_path) bb.debug(2, cmd) - subprocess.check_output(cmd, shell=True) + subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT) def staging_populate_sysroot_dir(targetsysroot, nativesysroot, native, d): @@ -228,7 +228,7 @@ def staging_populate_sysroot_dir(targetsysroot, nativesysroot, native, d): staging_processfixme(fixme, targetdir, targetsysroot, nativesysroot, d) for p in postinsts: - subprocess.check_output(p, shell=True) + subprocess.check_output(p, shell=True, stderr=subprocess.STDOUT) # # Manifests here are complicated. The main sysroot area has the unpacked sstate @@ -576,7 +576,7 @@ python extend_recipe_sysroot() { staging_processfixme(fixme[f], multilibs[f].getVar("RECIPE_SYSROOT"), recipesysroot, recipesysrootnative, d) for p in postinsts: - subprocess.check_output(p, shell=True) + subprocess.check_output(p, shell=True, stderr=subprocess.STDOUT) for dep in manifests: c = setscenedeps[dep][0] diff --git a/meta/classes/testsdk.bbclass b/meta/classes/testsdk.bbclass index 6b51a33db2..9fe8c34fc2 100644 --- a/meta/classes/testsdk.bbclass +++ b/meta/classes/testsdk.bbclass @@ -159,7 +159,8 @@ def testsdkext_main(d): f.write('INHERIT += "own-mirrors"') # We need to do this in case we have a minimal SDK - subprocess.check_output(". %s > /dev/null; devtool sdk-install meta-extsdk-toolchain" % sdk_env, cwd=sdk_dir, shell=True) + subprocess.check_output(". %s > /dev/null; devtool sdk-install meta-extsdk-toolchain" % \ + sdk_env, cwd=sdk_dir, shell=True, stderr=subprocess.STDOUT) tc = OESDKExtTestContext(td=test_data, logger=logger, sdk_dir=sdk_dir, sdk_env=sdk_env, target_pkg_manifest=target_pkg_manifest, |