From 5b7c822609a42e58e96a004071978c9ff196e955 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Sun, 3 Feb 2013 17:59:03 +0000
Subject: package.bbclass: Pre-expand some variables to save time

(From OE-Core rev: fc5bff0145d8f5db1c09be61f5de209ac4016ed1)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 meta/classes/package.bbclass | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'meta/classes')

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 7c79c69287..e5d444b161 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1802,6 +1802,20 @@ python do_package () {
         bb.error("WORKDIR, DEPLOY_DIR, D, PN and PKGD all must be defined, unable to package")
         return
 
+    ###########################################################################
+    # Optimisations
+    ###########################################################################
+
+    # Contunually rexpanding complex expressions is inefficient, particularly when
+    # we write to the datastore and invalidate the expansion cache. This code 
+    # pre-expands some frequently used variables
+
+    def expandVar(x, d):
+        d.setVar(x, d.getVar(x, True))
+
+    for x in 'PN', 'PV', 'BPN', 'TARGET_SYS', 'EXTENDPRAUTO':
+        expandVar(x, d)
+
     ###########################################################################
     # Setup PKGD (from D)
     ###########################################################################
-- 
cgit v1.2.3-54-g00ecf