[oe-commits] org.oe.dev base.bbclass: Optimise get_subpkgedata_fn() to minimise expand calls

[rpurdie commit]

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

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 3e0e5727f7fe0745a9ac42f53da9955314c5f869
ViewMTN: http://monotone.openembedded.org/revision/info/3e0e5727f7fe0745a9ac42f53da9955314c5f869
Files:
1
classes/base.bbclass
Diffs:

#
# mt diff -rc6d6b852ce9eeb3cebe0f59ba8a51f62af742d26 -r3e0e5727f7fe0745a9ac42f53da9955314c5f869
#
# 
# 
# patch "classes/base.bbclass"
#  from [d416d69e08d5817491757b1b092d6943774c231c]
#    to [1a4cea219c6fbdcac157bc9e75d192ac0d8ff7fc]
# 
============================================================
--- classes/base.bbclass	d416d69e08d5817491757b1b092d6943774c231c
+++ classes/base.bbclass	1a4cea219c6fbdcac157bc9e75d192ac0d8ff7fc
@@ -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)