summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-14 16:04:42 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-31 21:11:45 +0100
commitde485f4973788be96384c0432355843a2a3527df (patch)
treed9cadbcbc1cffe682de0f23600bfdcea043dc584
parent56310cbc4cb4f61db36ce826730c4dc59a908332 (diff)
downloadpoky-de485f4973788be96384c0432355843a2a3527df.tar.gz
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) (From OE-Core rev: c6148b8dde3e0fddc4135b48fd6d01e2de662919) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Joshua Lock <josh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 c9b84c8d6c..25cea26ce2 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}-$
10SSTATE_PKGNAME = "${SSTATE_PKGSPEC}${BB_TASKHASH}" 10SSTATE_PKGNAME = "${SSTATE_PKGSPEC}${BB_TASKHASH}"
11SSTATE_PKG = "${SSTATE_DIR}/${SSTATE_PKGNAME}" 11SSTATE_PKG = "${SSTATE_DIR}/${SSTATE_PKGNAME}"
12 12
13SSTATE_SCAN_CMD ?= "find ${SSTATE_BUILDDIR} \( -name "*.la" -o -name "*-config" \) -type f" 13SSTATE_SCAN_FILES ?= "*.la *-config"
14SSTATE_SCAN_CMD ?= 'find ${SSTATE_BUILDDIR} \( -name "${@"\" -o -name \"".join(d.getVar("SSTATE_SCAN_FILES", True).split())}" \) -type f'
14 15
15BB_HASHFILENAME = "${SSTATE_PKGNAME}" 16BB_HASHFILENAME = "${SSTATE_PKGNAME}"
16 17