summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-17 12:11:15 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-01-20 11:53:49 +0000
commitd80c95d53f9116e60497385389e84ea0ee1bb44e (patch)
treea4b0c9f3570ce9dff7c4cab5ae61afb617e98e73 /meta
parent9b3e808624292ae9243ceca2c349f642c3c97ea7 (diff)
downloadpoky-d80c95d53f9116e60497385389e84ea0ee1bb44e.tar.gz
multilib_global: Drop pointless event mask/code filtering
This code was pointless so cleanup, drop the unused event and the filtering is no longer needed. (From OE-Core rev: 4fd9e74035703b45a9e6e9143b1ec421e172200c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/multilib_global.bbclass10
1 files changed, 4 insertions, 6 deletions
diff --git a/meta/classes/multilib_global.bbclass b/meta/classes/multilib_global.bbclass
index aba0371648..c9869fd592 100644
--- a/meta/classes/multilib_global.bbclass
+++ b/meta/classes/multilib_global.bbclass
@@ -137,13 +137,11 @@ addhandler multilib_virtclass_handler_vendor
137multilib_virtclass_handler_vendor[eventmask] = "bb.event.ConfigParsed" 137multilib_virtclass_handler_vendor[eventmask] = "bb.event.ConfigParsed"
138 138
139python multilib_virtclass_handler_global () { 139python multilib_virtclass_handler_global () {
140 if not e.data:
141 return
142
143 variant = e.data.getVar("BBEXTENDVARIANT") 140 variant = e.data.getVar("BBEXTENDVARIANT")
141 if variant:
142 return
144 143
145 if isinstance(e, bb.event.RecipeParsed) and not variant: 144 if bb.data.inherits_class('kernel', e.data) or \
146 if bb.data.inherits_class('kernel', e.data) or \
147 bb.data.inherits_class('module-base', e.data) or \ 145 bb.data.inherits_class('module-base', e.data) or \
148 (bb.data.inherits_class('allarch', e.data) and\ 146 (bb.data.inherits_class('allarch', e.data) and\
149 not bb.data.inherits_class('packagegroup', e.data)): 147 not bb.data.inherits_class('packagegroup', e.data)):
@@ -177,5 +175,5 @@ python multilib_virtclass_handler_global () {
177} 175}
178 176
179addhandler multilib_virtclass_handler_global 177addhandler multilib_virtclass_handler_global
180multilib_virtclass_handler_global[eventmask] = "bb.event.RecipePreFinalise bb.event.RecipeParsed" 178multilib_virtclass_handler_global[eventmask] = "bb.event.RecipeParsed"
181 179