diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2008-02-23 23:40:47 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2008-02-23 23:40:47 +0000 |
| commit | 3388719cb1741964a43d7eb1cb093e3fcb0a8f56 (patch) | |
| tree | 9c8fb919443e5289b1c14e1a7f4e17e0eab4e07a /classes/base.bbclass | |
| parent | c4d731645de4e5e8e588f12efd5bfd3c361ebc51 (diff) | |
base.bbclass: Optimise get_subpkgedata_fn() to minimise expand calls
Diffstat (limited to 'classes/base.bbclass')
| -rw-r--r-- | classes/base.bbclass | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index f38a5b7fbc..2f74104185 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -777,8 +777,10 @@ def get_subpkgedata_fn(pkg, d): import bb, os archs = bb.data.expand("${PACKAGE_ARCHS}", d).split(" ") archs.reverse() + pkgdata = bb.data.expand('${STAGING_DIR}/pkgdata/', d) + targetdir = bb.data.expand('${TARGET_VENDOR}-${TARGET_OS}/runtime/', d) for arch in archs: - fn = bb.data.expand('${STAGING_DIR}/pkgdata/' + arch + '${TARGET_VENDOR}-${TARGET_OS}/runtime/%s' % pkg, d) + fn = pkgdata + arch + targetdir + pkg if os.path.exists(fn): return fn return bb.data.expand('${PKGDATA_DIR}/runtime/%s' % pkg, d) |