summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-14 16:04:42 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-12-15 14:29:26 +0000
commit6ffdcd9120b572fa41659029c3bda7bf00ebcb77 (patch)
treec43a5383fcb8a443fd985491df5bec5bca9eac25 /meta
parent54b91b6b1ac67ce2259fa82c0e0f7d26577ba935 (diff)
downloadopenembedded-core-6ffdcd9120b572fa41659029c3bda7bf00ebcb77.tar.gz
openembedded-core-6ffdcd9120b572fa41659029c3bda7bf00ebcb77.tar.bz2
openembedded-core-6ffdcd9120b572fa41659029c3bda7bf00ebcb77.zip
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> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 504b09975d..0f88a23ec9 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}"