summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorStefan Agner <stefan.agner@toradex.com>2019-03-01 23:58:02 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-03-03 15:38:13 +0000
commitd6f3bc736cc1440e3e93a7cce04125d5999bc0c8 (patch)
tree27f762103deb026c507cb93a552b055cfe879ee8 /meta
parent4860914b3b5b38926ed6a80bb83a011d341ff2d8 (diff)
downloadpoky-d6f3bc736cc1440e3e93a7cce04125d5999bc0c8.tar.gz
psplash: improve make-image-header.sh call
Simplify make-image-header.sh call and make sure it gets called in the current working directory. Also check the return value of the function call. (From OE-Core rev: d4c55e2448053b51eb217c61328a2ca25bec0461) Signed-off-by: Stefan Agner <stefan.agner@toradex.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/psplash/psplash_git.bb6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb
index 3ad1ef4815..3161a5e3f1 100644
--- a/meta/recipes-core/psplash/psplash_git.bb
+++ b/meta/recipes-core/psplash/psplash_git.bb
@@ -74,7 +74,6 @@ ALTERNATIVE_LINK_NAME[psplash] = "${bindir}/psplash"
74python do_compile () { 74python do_compile () {
75 import shutil 75 import shutil
76 import subprocess 76 import subprocess
77 import shlex
78 77
79 # Build a separate executable for each splash image 78 # Build a separate executable for each splash image
80 workdir = d.getVar('WORKDIR') 79 workdir = d.getVar('WORKDIR')
@@ -84,9 +83,10 @@ python do_compile () {
84 outputfiles = d.getVar('SPLASH_INSTALL').split() 83 outputfiles = d.getVar('SPLASH_INSTALL').split()
85 for localfile, outputfile in zip(localfiles, outputfiles): 84 for localfile, outputfile in zip(localfiles, outputfiles):
86 if localfile.endswith(".png"): 85 if localfile.endswith(".png"):
87 subprocess.call(shlex.split('%s %s POKY' % (convertscript, os.path.join(workdir, localfile)))) 86 if subprocess.call([ convertscript, os.path.join(workdir, localfile), 'POKY' ], cwd=workdir):
87 bb.fatal("Error calling convert script '%s'" % (convertscript))
88 fbase = os.path.splitext(localfile)[0] 88 fbase = os.path.splitext(localfile)[0]
89 shutil.copyfile("%s-img.h" % fbase, destfile) 89 shutil.copyfile(os.path.join(workdir, "%s-img.h" % fbase), destfile)
90 else: 90 else:
91 shutil.copyfile(os.path.join(workdir, localfile), destfile) 91 shutil.copyfile(os.path.join(workdir, localfile), destfile)
92 # For some reason just updating the header is not enough, we have to touch the .c 92 # For some reason just updating the header is not enough, we have to touch the .c