From: Richard Purdie <rpurdie@rpsys.net>
Date: Sat, 23 Feb 2008 23:40:47 +0000 (+0000)
Subject: base.bbclass: Optimise get_subpkgedata_fn() to minimise expand calls
X-Git-Tag: Release-2010-05/1~7623^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3388719cb1741964a43d7eb1cb093e3fcb0a8f56;p=openembedded.git

base.bbclass: Optimise get_subpkgedata_fn() to minimise expand calls
---

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)