summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-08-12 11:36:37 +0000
committerRichard Purdie <richard@openedhand.com>2007-08-12 11:36:37 +0000
commitfc136f0b4c9f6c0bed18fb565f5c83d041abdd39 (patch)
treebc7b070854caf3d83cbbf399f8dd7f522c0aa760 /meta
parentc9c5d36d35a74630c11a958cc77b60bee96e3d69 (diff)
downloadpoky-fc136f0b4c9f6c0bed18fb565f5c83d041abdd39.tar.gz
base.bbclass: Improve performance with SRC_URI_OVERRIDES_PACKAGE_ARCH enabled (14% parsing speedup)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2483 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/base.bbclass17
1 files changed, 9 insertions, 8 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 643b9f429e..4e6a22b2f8 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -792,9 +792,9 @@ python read_subpackage_metadata () {
792 bb.data.setVar(key, sdata[key], d) 792 bb.data.setVar(key, sdata[key], d)
793} 793}
794 794
795def base_after_parse_two(d): 795def base_after_parse(d):
796 import bb 796 import bb, os, exceptions
797 import exceptions 797
798 need_host = bb.data.getVar('COMPATIBLE_HOST', d, 1) 798 need_host = bb.data.getVar('COMPATIBLE_HOST', d, 1)
799 if need_host: 799 if need_host:
800 import re 800 import re
@@ -820,9 +820,6 @@ def base_after_parse_two(d):
820 if use_nls != None: 820 if use_nls != None:
821 bb.data.setVar('USE_NLS', use_nls, d) 821 bb.data.setVar('USE_NLS', use_nls, d)
822 822
823def base_after_parse(d):
824 import bb, os
825
826 # Make sure MACHINE isn't exported 823 # Make sure MACHINE isn't exported
827 # (breaks binutils at least) 824 # (breaks binutils at least)
828 bb.data.delVarFlag('MACHINE', 'export', d) 825 bb.data.delVarFlag('MACHINE', 'export', d)
@@ -856,7 +853,12 @@ def base_after_parse(d):
856 853
857 paths = [] 854 paths = []
858 for p in [ "${PF}", "${P}", "${PN}", "files", "" ]: 855 for p in [ "${PF}", "${P}", "${PN}", "files", "" ]:
859 paths.append(bb.data.expand(os.path.join("${FILE_DIRNAME}", p, "${MACHINE}"), d)) 856 path = bb.data.expand(os.path.join("${FILE_DIRNAME}", p, "${MACHINE}"), d)
857 if os.path.isdir(path):
858 paths.append(path)
859 if len(paths) == 0:
860 return
861
860 for s in bb.data.getVar('SRC_URI', d, 1).split(): 862 for s in bb.data.getVar('SRC_URI', d, 1).split():
861 if not s.startswith("file://"): 863 if not s.startswith("file://"):
862 continue 864 continue
@@ -868,7 +870,6 @@ def base_after_parse(d):
868 return 870 return
869 871
870python () { 872python () {
871 base_after_parse_two(d)
872 base_after_parse(d) 873 base_after_parse(d)
873} 874}
874 875