[PATCH 0/1] fix a build issue for psplash recipe

[PATCH 0/1] fix a build issue for psplash recipe

[nitin.a.kamble]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

This was detected on the autobuilder. More details are in the commit.

Thanks,
Nitin

The following changes since commit bdca49274173153b1b0a72887de6321b4756b684:

  classes/rm_work: rename RM_WORK_WHITELIST to RM_WORK_EXCLUDE (2013-03-26 21:19:51 +0000)

are available in the git repository at:
  git://git.pokylinux.org/poky-contrib nitin/misc
  http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=nitin/misc

Nitin A Kamble (1):
  psplash_git.bb: fix do_compile by correcting the script path

 meta/recipes-core/psplash/psplash_git.bb |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

-- 
1.7.3.4

[PATCH 1/1] psplash_git.bb: fix do_compile by correcting the script path

[nitin.a.kamble]

From: Nitin A Kamble <nitin.a.kamble@intel.com>

The recent change in the builddir location is breaking this recipe as
it is trying to run a script (make-image-header.sh) located in sourcedir
from builddir. As the script does not gets to run, the resulting file is
not generated causing error as seen below. This commit fixes the issue, by
providing complete path of the script.

This commit fixes this build error:

ERROR: Error executing a python function in /srv/home/nitin/prj/poky.git/meta/recipes-core/psplash/psplash_git.bb:
IOError: [Errno 2] No such file or directory: 'psplash-tlk-img.h'
ERROR: Task 6 (/srv/home/nitin/prj/poky.git/meta/recipes-core/psplash/psplash_git.bb, do_compile) failed with exit code '1'

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
 meta/recipes-core/psplash/psplash_git.bb |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-core/psplash/psplash_git.bb b/meta/recipes-core/psplash/psplash_git.bb
index 5413b24..2d0cae3 100644
--- a/meta/recipes-core/psplash/psplash_git.bb
+++ b/meta/recipes-core/psplash/psplash_git.bb
@@ -74,12 +74,13 @@ python do_compile () {
     import shutil, commands
 
     # Build a separate executable for each splash image
+    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 = commands.getstatusoutput('./make-image-header.sh %s POKY' % localfile)
+            outp = commands.getstatusoutput('%s %s POKY' % (convertscript, localfile))
             print(outp[1])
             fbase = os.path.splitext(os.path.basename(localfile))[0]
             shutil.copyfile("%s-img.h" % fbase, destfile)
-- 
1.7.3.4