psplash: improve make-image-header.sh call
PATCH 1/1 psplash: improve make-image-header.sh call
From: Stefan Agner <[email protected]>
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.
Signed-off-by Stefan Agner <[email protected]>
--- meta/recipes-core/psplash/psplash_git.bb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
meta/recipes-core/psplash/psplash_git.bb +3 -3
@@ -74,7 +74,6 @@ ALTERNATIVE_LINK_NAME[psplash] = "${bindir}/psplash" python do_compile () { import shutil import subprocess - import shlex # Build a separate executable for each splash image workdir = d.getVar('WORKDIR')
@@ -84,9 +83,10 @@ python do_compile () { outputfiles = d.getVar('SPLASH_INSTALL').split() for localfile, outputfile in zip(localfiles, outputfiles): if localfile.endswith(".png"): - subprocess.call(shlex.split('%s %s POKY' % (convertscript, os.path.join(workdir, localfile)))) + if subprocess.call([ convertscript, os.path.join(workdir, localfile), 'POKY' ], cwd=workdir): + bb.fatal("Error calling convert script '%s'" % (convertscript)) fbase = os.path.splitext(localfile)[0] - shutil.copyfile("%s-img.h" % fbase, destfile) + shutil.copyfile(os.path.join(workdir, "%s-img.h" % fbase), destfile) else: shutil.copyfile(os.path.join(workdir, localfile), destfile) # For some reason just updating the header is not enough, we have to touch the .c
Signature · 1 line
2.13.6