mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-19 18:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

psplash: improve make-image-header.sh call

Browse Source 
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>
This commit is contained in:
Stefan Agner
2019-03-01 23:58:02 +01:00
committed by Richard Purdie
parent 4860914b3b
commit d6f3bc736c
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
meta/recipes-core/psplash/psplash_git.bb
View File

@@ -74,7 +74,6 @@ ALTERNATIVE_LINK_NAME[psplash] = "${bindir}/psplash"
python do_compile () { python do_compile () {
import shutil import shutil
import subprocess import subprocess
import shlex
# Build a separate executable for each splash image # Build a separate executable for each splash image
workdir = d.getVar('WORKDIR') workdir = d.getVar('WORKDIR')
@@ -84,9 +83,10 @@ python do_compile () {
outputfiles = d.getVar('SPLASH_INSTALL').split() outputfiles = d.getVar('SPLASH_INSTALL').split()
for localfile, outputfile in zip(localfiles, outputfiles): for localfile, outputfile in zip(localfiles, outputfiles):
if localfile.endswith(".png"): 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] 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: else:
shutil.copyfile(os.path.join(workdir, localfile), destfile) shutil.copyfile(os.path.join(workdir, localfile), destfile)
# For some reason just updating the header is not enough, we have to touch the .c # For some reason just updating the header is not enough, we have to touch the .c