summaryrefslogtreecommitdiffstats
path: root/meta/conf/distro
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-12 16:31:57 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-06-14 12:55:47 +0100
commit53841ce521d44c0c9cca512675a12f81a491fe52 (patch)
tree98a2ca75581f4bb488e43087b6b9128017aac135 /meta/conf/distro
parent98abb113a02a4504ae969dbaf9844ab6539dcdb8 (diff)
downloadpoky-53841ce521d44c0c9cca512675a12f81a491fe52.tar.gz
classes/conf: Add eventmasks for event handlers
Now that bitbake supports masking events for event handlers, lets use this so event handlers are only called for events they care about. This lets us simplify the code indentation a bit at least as well as mildly improving the event handling performance. (From OE-Core rev: bff73743280f9eafebe4591f7368ead91a4eb74d) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/distro')
-rw-r--r--meta/conf/distro/include/csl-versions.inc3
-rw-r--r--meta/conf/distro/include/tcmode-external-sourcery.inc8
2 files changed, 3 insertions, 8 deletions
diff --git a/meta/conf/distro/include/csl-versions.inc b/meta/conf/distro/include/csl-versions.inc
index e8f52d272d..f3b491cb16 100644
--- a/meta/conf/distro/include/csl-versions.inc
+++ b/meta/conf/distro/include/csl-versions.inc
@@ -88,8 +88,6 @@ def csl_get_gdb_version(d):
88 return first_line.split()[-1] 88 return first_line.split()[-1]
89 89
90python csl_version_handler () { 90python csl_version_handler () {
91 if not isinstance(e, bb.event.ConfigParsed):
92 return
93 d = e.data 91 d = e.data
94 ld = d.createCopy() 92 ld = d.createCopy()
95 ld.finalize() 93 ld.finalize()
@@ -101,6 +99,7 @@ python csl_version_handler () {
101 d.setVar('CSL_VER_GDB', csl_get_gdb_version(ld)) 99 d.setVar('CSL_VER_GDB', csl_get_gdb_version(ld))
102} 100}
103addhandler csl_version_handler 101addhandler csl_version_handler
102csl_version_handler[eventmask] = "bb.event.ConfigParsed"
104 103
105# Ensure that any variable which includes the --sysroot (CC, CXX, etc) also 104# Ensure that any variable which includes the --sysroot (CC, CXX, etc) also
106# depends on the toolchain version 105# depends on the toolchain version
diff --git a/meta/conf/distro/include/tcmode-external-sourcery.inc b/meta/conf/distro/include/tcmode-external-sourcery.inc
index 098c724e02..53e6653e79 100644
--- a/meta/conf/distro/include/tcmode-external-sourcery.inc
+++ b/meta/conf/distro/include/tcmode-external-sourcery.inc
@@ -79,9 +79,6 @@ EXTERNAL_TOOLCHAIN_SYSROOT_CMD += "${@csl_multilib_arg(d)}"
79# to our staging toolchain bindir. 79# to our staging toolchain bindir.
80 80
81python toolchain_metadata_setup () { 81python toolchain_metadata_setup () {
82 if not isinstance(e, bb.event.ConfigParsed):
83 return
84
85 d = e.data 82 d = e.data
86 83
87 l = d.createCopy() 84 l = d.createCopy()
@@ -90,17 +87,16 @@ python toolchain_metadata_setup () {
90 d.setVar('TOOLCHAIN_PATH_ADD', '') 87 d.setVar('TOOLCHAIN_PATH_ADD', '')
91} 88}
92addhandler toolchain_metadata_setup 89addhandler toolchain_metadata_setup
90toolchain_metadata_setup[eventmask] = "bb.event.ConfigParsed"
93 91
94python toolchain_setup () { 92python toolchain_setup () {
95 if not isinstance(e, bb.event.BuildStarted):
96 return
97
98 d = e.data 93 d = e.data
99 94
100 if not d.getVar('TOOLCHAIN_PATH_ADD', True): 95 if not d.getVar('TOOLCHAIN_PATH_ADD', True):
101 populate_toolchain_links(d) 96 populate_toolchain_links(d)
102} 97}
103addhandler toolchain_setup 98addhandler toolchain_setup
99toolchain_setup[eventmask] = "bb.event.BuildStarted"
104 100
105def populate_toolchain_links(d): 101def populate_toolchain_links(d):
106 import errno 102 import errno