summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/staging.bbclass6
-rw-r--r--meta/classes/testsdk.bbclass3
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):
171 fixme_path = d.getVar(fixmevar) 171 fixme_path = d.getVar(fixmevar)
172 cmd += " -e 's:FIXME_%s:%s:g'" % (fixmevar, fixme_path) 172 cmd += " -e 's:FIXME_%s:%s:g'" % (fixmevar, fixme_path)
173 bb.debug(2, cmd) 173 bb.debug(2, cmd)
174 subprocess.check_output(cmd, shell=True) 174 subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT)
175 175
176 176
177def staging_populate_sysroot_dir(targetsysroot, nativesysroot, native, d): 177def staging_populate_sysroot_dir(targetsysroot, nativesysroot, native, d):
@@ -228,7 +228,7 @@ def staging_populate_sysroot_dir(targetsysroot, nativesysroot, native, d):
228 228
229 staging_processfixme(fixme, targetdir, targetsysroot, nativesysroot, d) 229 staging_processfixme(fixme, targetdir, targetsysroot, nativesysroot, d)
230 for p in postinsts: 230 for p in postinsts:
231 subprocess.check_output(p, shell=True) 231 subprocess.check_output(p, shell=True, stderr=subprocess.STDOUT)
232 232
233# 233#
234# Manifests here are complicated. The main sysroot area has the unpacked sstate 234# Manifests here are complicated. The main sysroot area has the unpacked sstate
@@ -576,7 +576,7 @@ python extend_recipe_sysroot() {
576 staging_processfixme(fixme[f], multilibs[f].getVar("RECIPE_SYSROOT"), recipesysroot, recipesysrootnative, d) 576 staging_processfixme(fixme[f], multilibs[f].getVar("RECIPE_SYSROOT"), recipesysroot, recipesysrootnative, d)
577 577
578 for p in postinsts: 578 for p in postinsts:
579 subprocess.check_output(p, shell=True) 579 subprocess.check_output(p, shell=True, stderr=subprocess.STDOUT)
580 580
581 for dep in manifests: 581 for dep in manifests:
582 c = setscenedeps[dep][0] 582 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):
159 f.write('INHERIT += "own-mirrors"') 159 f.write('INHERIT += "own-mirrors"')
160 160
161 # We need to do this in case we have a minimal SDK 161 # We need to do this in case we have a minimal SDK
162 subprocess.check_output(". %s > /dev/null; devtool sdk-install meta-extsdk-toolchain" % sdk_env, cwd=sdk_dir, shell=True) 162 subprocess.check_output(". %s > /dev/null; devtool sdk-install meta-extsdk-toolchain" % \
163 sdk_env, cwd=sdk_dir, shell=True, stderr=subprocess.STDOUT)
163 164
164 tc = OESDKExtTestContext(td=test_data, logger=logger, sdk_dir=sdk_dir, 165 tc = OESDKExtTestContext(td=test_data, logger=logger, sdk_dir=sdk_dir,
165 sdk_env=sdk_env, target_pkg_manifest=target_pkg_manifest, 166 sdk_env=sdk_env, target_pkg_manifest=target_pkg_manifest,