summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/psplash
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2013-09-27 15:46:06 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-09-30 22:01:06 +0100
commitf1850f9835651baee8d3a0858d00a5d22efcab19 (patch)
tree6b8ded210408e06d2ae31ebb7bd873ed901f0107 /meta/recipes-core/psplash
parent8d7036cdb71e66e619053c2545cfc1fbddf1895b (diff)
downloadopenembedded-core-contrib-f1850f9835651baee8d3a0858d00a5d22efcab19.tar.gz
openembedded-core-contrib-f1850f9835651baee8d3a0858d00a5d22efcab19.tar.bz2
openembedded-core-contrib-f1850f9835651baee8d3a0858d00a5d22efcab19.zip
psplash: copy image files from workdir instead of next to recipe
During parsing this recipe builds up a list of splash image files, however it was recording full paths to local files (i.e. the files next to the recipe) and then in do_compile it was pointing to those instead of the fetched files in WORKDIR. Fix it to use the fetched files which has the added benefit of the do_compile signature not changing if the recipe is moved around. Fixes [YOCTO #5250]. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> 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.bb11
1 files changed, 6 insertions, 5 deletions
diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb
index 5122d38a29..1cab2962b2 100644
--- a/meta/recipes-core/psplash/psplash_git.bb
+++ b/meta/recipes-core/psplash/psplash_git.bb
@@ -23,8 +23,8 @@ python __anonymous() {
haspng = False
for uri in splashfiles:
fetcher = bb.fetch2.Fetch([uri], d)
- flocal = fetcher.localpath(uri)
- fbase = os.path.splitext(os.path.basename(flocal))[0]
+ flocal = os.path.basename(fetcher.localpath(uri))
+ fbase = os.path.splitext(flocal)[0]
outsuffix = fetcher.ud[uri].parm.get("outsuffix")
if not outsuffix:
if fbase.startswith("psplash-"):
@@ -74,18 +74,19 @@ python do_compile () {
import shutil
# Build a separate executable for each splash image
+ workdir = d.getVar('WORKDIR', True)
convertscript = "%s/make-image-header.sh" % d.getVar('S', True)
destfile = "%s/psplash-poky-img.h" % d.getVar('S', True)
localfiles = d.getVar('SPLASH_LOCALPATHS', True).split()
outputfiles = d.getVar('SPLASH_INSTALL', True).split()
for localfile, outputfile in zip(localfiles, outputfiles):
if localfile.endswith(".png"):
- outp = oe.utils.getstatusoutput('%s %s POKY' % (convertscript, localfile))
+ outp = oe.utils.getstatusoutput('%s %s POKY' % (convertscript, os.path.join(workdir, localfile)))
print(outp[1])
- fbase = os.path.splitext(os.path.basename(localfile))[0]
+ fbase = os.path.splitext(localfile)[0]
shutil.copyfile("%s-img.h" % fbase, destfile)
else:
- shutil.copyfile(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
# file in order to get it to rebuild
os.utime("%s/psplash.c" % d.getVar('S', True), None)