[OE-core] [PATCH 3/7] sstate: Add SSTATE_SCAN_FILES
Saul Wold
sgw at linux.intel.com
Thu Dec 15 01:50:07 UTC 2011
This allows recipes to specify files that may be outside the normal set
for inclusion when there are hardcoded paths that need to be fixmepathed
to work correctly.
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
meta/classes/sstate.bbclass | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass
index 504b099..5452a43 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} \( ${SSTATE_FIND_CMD_FILES} \) -type f"
BB_HASHFILENAME = "${SSTATE_PKGNAME}"
@@ -33,6 +34,13 @@ python () {
else:
d.setVar('SSTATE_MANMACH', bb.data.expand("${MACHINE}", d))
+ find_cmd_files = ""
+ for file in d.getVar('SSTATE_SCAN_FILES', True).split():
+ find_file = "-o -name \"" + file + "\""
+ find_cmd_files = find_cmd_files + " " + find_file
+ d.setVar('SSTATE_FIND_CMD_FILES', find_cmd_files.replace("-o ", "", 1))
+ bb.note("FIND_CMD_FILES = %s" % find_cmd_files)
+
# These classes encode staging paths into their scripts data so can only be
# reused if we manipulate the paths
if bb.data.inherits_class('native', d) or bb.data.inherits_class('cross', d) or bb.data.inherits_class('sdk', d) or bb.data.inherits_class('crosssdk', d):
@@ -299,6 +307,7 @@ def sstate_hardcode_path(d):
# Need to remove hardcoded paths and fix these when we install the
# staging packages.
sstate_scan_cmd = d.getVar('SSTATE_SCAN_CMD', True)
+ bb.note("SCAN_CMD = %s" % sstate_scan_cmd)
p = os.popen("%s" % sstate_scan_cmd)
file_list = p.read()
--
1.7.6.4
More information about the Openembedded-core
mailing list