summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/psplash
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-09 14:55:04 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-05-09 16:05:08 +0100
commitb54339d63339c99f24845f69f49cd1fe996e6e7c (patch)
tree73b3da57a66ab4a0f6fa06a479efc5449126342f /meta/recipes-core/psplash
parentd529c11fa512e7f06044378a7ec7137765ea8eb4 (diff)
downloadpoky-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/recipes-core/psplash')
-rw-r--r--meta/recipes-core/psplash/psplash_git.bb4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb
index 392fada689..fdb5e77896 100644
--- a/meta/recipes-core/psplash/psplash_git.bb
+++ b/meta/recipes-core/psplash/psplash_git.bb
@@ -71,7 +71,7 @@ ALTERNATIVE_PRIORITY = "100"
71ALTERNATIVE_LINK_NAME[psplash] = "${bindir}/psplash" 71ALTERNATIVE_LINK_NAME[psplash] = "${bindir}/psplash"
72 72
73python do_compile () { 73python do_compile () {
74 import shutil, subprocess 74 import shutil
75 75
76 # Build a separate executable for each splash image 76 # Build a separate executable for each splash image
77 convertscript = "%s/make-image-header.sh" % d.getVar('S', True) 77 convertscript = "%s/make-image-header.sh" % d.getVar('S', True)
@@ -80,7 +80,7 @@ python do_compile () {
80 outputfiles = d.getVar('SPLASH_INSTALL', True).split() 80 outputfiles = d.getVar('SPLASH_INSTALL', True).split()
81 for localfile, outputfile in zip(localfiles, outputfiles): 81 for localfile, outputfile in zip(localfiles, outputfiles):
82 if localfile.endswith(".png"): 82 if localfile.endswith(".png"):
83 outp = subprocess.getstatusoutput('%s %s POKY' % (convertscript, localfile)) 83 outp = oe.utils.getstatusoutput('%s %s POKY' % (convertscript, localfile))
84 print(outp[1]) 84 print(outp[1])
85 fbase = os.path.splitext(os.path.basename(localfile))[0] 85 fbase = os.path.splitext(os.path.basename(localfile))[0]
86 shutil.copyfile("%s-img.h" % fbase, destfile) 86 shutil.copyfile("%s-img.h" % fbase, destfile)