diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2018-08-23 16:07:27 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-08-23 18:02:23 +0100 |
| commit | 1ad6e2cd04cbf1e54ea90c018ade602c9cad9595 (patch) | |
| tree | a75481e343bea0372b255189dd8d949e00a26c76 | |
| parent | 37b1ed066dfdb09be6f0abef6907a838f373686c (diff) | |
| download | poky-1ad6e2cd04cbf1e54ea90c018ade602c9cad9595.tar.gz | |
psplash: Clean up getstatusoutput usage
Replace usage of oe.utils.getstatusoutput() with direct subprocess calls.
(From OE-Core rev: 2a06abb258768504a3ad97f61c987709227d7109)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/psplash/psplash_git.bb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb index aab2c0360d..3ad1ef4815 100644 --- a/meta/recipes-core/psplash/psplash_git.bb +++ b/meta/recipes-core/psplash/psplash_git.bb | |||
| @@ -73,6 +73,8 @@ ALTERNATIVE_LINK_NAME[psplash] = "${bindir}/psplash" | |||
| 73 | 73 | ||
| 74 | python do_compile () { | 74 | python do_compile () { |
| 75 | import shutil | 75 | import shutil |
| 76 | import subprocess | ||
| 77 | import shlex | ||
| 76 | 78 | ||
| 77 | # Build a separate executable for each splash image | 79 | # Build a separate executable for each splash image |
| 78 | workdir = d.getVar('WORKDIR') | 80 | workdir = d.getVar('WORKDIR') |
| @@ -82,8 +84,7 @@ python do_compile () { | |||
| 82 | outputfiles = d.getVar('SPLASH_INSTALL').split() | 84 | outputfiles = d.getVar('SPLASH_INSTALL').split() |
| 83 | for localfile, outputfile in zip(localfiles, outputfiles): | 85 | for localfile, outputfile in zip(localfiles, outputfiles): |
| 84 | if localfile.endswith(".png"): | 86 | if localfile.endswith(".png"): |
| 85 | outp = oe.utils.getstatusoutput('%s %s POKY' % (convertscript, os.path.join(workdir, localfile))) | 87 | subprocess.call(shlex.split('%s %s POKY' % (convertscript, os.path.join(workdir, localfile)))) |
| 86 | print(outp[1]) | ||
| 87 | fbase = os.path.splitext(localfile)[0] | 88 | fbase = os.path.splitext(localfile)[0] |
| 88 | shutil.copyfile("%s-img.h" % fbase, destfile) | 89 | shutil.copyfile("%s-img.h" % fbase, destfile) |
| 89 | else: | 90 | else: |
