[oe-commits] Wenzong Fan : sstate.bbclass: specify func dirs for sstate_hardcode_path

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: a949943e622b08485fc7632a0a743bc009079c67
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=a949943e622b08485fc7632a0a743bc009079c67

Author: Wenzong Fan <wenzong.fan at windriver.com>
Date:   Tue Oct 14 23:10:48 2014 -0400

sstate.bbclass: specify func dirs for sstate_hardcode_path

For some recipes that inhrient cmake, the ${B} may be removed by
cmake_do_configure() while sstate_hardcode_path() running, this
causes build errors:

  Exception: OSError: [Errno 2] No such file or directory: \
  '/path/to/build'

The function sstate_hardcode_path() called command:

  $SSTATE_SCAN_CMD which extended as "find ${SSTATE_BUILDDIR} ..."

So the proper function dirs could be ${SSTATE_BUILDDIR}.

Signed-off-by: Wenzong Fan <wenzong.fan at windriver.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 meta/classes/sstate.bbclass | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 9cd4590..f8695e7 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -47,6 +47,11 @@ SIGGEN_LOCKEDSIGS_CHECK_LEVEL ?= 'error'
 sstate_create_package[dirs] = "${SSTATE_BUILDDIR}"
 sstate_unpack_package[dirs] = "${SSTATE_INSTDIR}"
 
+# Do not run sstate_hardcode_path() in ${B}:
+# the ${B} maybe removed by cmake_do_configure() while
+# sstate_hardcode_path() running.
+sstate_hardcode_path[dirs] = "${SSTATE_BUILDDIR}"
+
 python () {
     if bb.data.inherits_class('native', d):
         d.setVar('SSTATE_PKGARCH', d.getVar('BUILD_ARCH'))