aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-14 16:04:42 -0800
committerJoshua Lock <josh@linux.intel.com>2012-05-21 22:14:03 -0700
commitc6148b8dde3e0fddc4135b48fd6d01e2de662919 (patch)
treea6fea0cd0106806d8b9e69a0308fa8b0ae1fd66f
parentd61c5fc67780b552fcf3d78ebcf9bd3888af4e0a (diff)
downloadopenembedded-core-c6148b8dde3e0fddc4135b48fd6d01e2de662919.zip
openembedded-core-c6148b8dde3e0fddc4135b48fd6d01e2de662919.tar.gz
openembedded-core-c6148b8dde3e0fddc4135b48fd6d01e2de662919.tar.bz2
sstate: Add SSTATE_SCAN_FILES
We process all files in the native/cross cases for finding and fixing relocation issues. In the target case we've only processed .la and binconfig files. Since there are other files which are in need of this processing, this change allows recipes to specify files that may be outside the normal set. This means hardcoded paths that need to be fixmepathed to work correctly are handled and addresses some sstate relocation bugs that have been seen. Based on a patch from Saul Wold <sgw@linux.intel.com> (From OE-Core rev: 6ffdcd9120b572fa41659029c3bda7bf00ebcb77) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Joshua Lock <josh@linux.intel.com>
-rw-r--r--meta/classes/sstate.bbclass3
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index c9b84c8..25cea26 100644
--- a/meta/classes/sstate.bbclass
+++ b/meta/classes/sstate.bbclass
@@ -10,7 +10,8 @@ SSTATE_PKGSPEC = "sstate-${PN}-${PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}-$
SSTATE_PKGNAME = "${SSTATE_PKGSPEC}${BB_TASKHASH}"
SSTATE_PKG = "${SSTATE_DIR}/${SSTATE_PKGNAME}"
-SSTATE_SCAN_CMD ?= "find ${SSTATE_BUILDDIR} \( -name "*.la" -o -name "*-config" \) -type f"
+SSTATE_SCAN_FILES ?= "*.la *-config"
+SSTATE_SCAN_CMD ?= 'find ${SSTATE_BUILDDIR} \( -name "${@"\" -o -name \"".join(d.getVar("SSTATE_SCAN_FILES", True).split())}" \) -type f'
BB_HASHFILENAME = "${SSTATE_PKGNAME}"