summaryrefslogtreecommitdiff
path: root/meta/classes/multilib_global.bbclass
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-19 22:45:54 +0000
commit4fd9e74035703b45a9e6e9143b1ec421e172200c (patch)
tree108d48ac6448a945a076664f86759af1aed1a592 /meta/classes/multilib_global.bbclass
parente10a973cd9390eacb13bdb99693a0622bd3695f5 (diff)
downloadopenembedded-core-4fd9e74035703b45a9e6e9143b1ec421e172200c.tar.gz
openembedded-core-4fd9e74035703b45a9e6e9143b1ec421e172200c.tar.bz2
openembedded-core-4fd9e74035703b45a9e6e9143b1ec421e172200c.zip
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. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/multilib_global.bbclass')
-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
multilib_virtclass_handler_vendor[eventmask] = "bb.event.ConfigParsed"
python multilib_virtclass_handler_global () {
- if not e.data:
- return
-
variant = e.data.getVar("BBEXTENDVARIANT")
+ if variant:
+ return
- if isinstance(e, bb.event.RecipeParsed) and not variant:
- if bb.data.inherits_class('kernel', e.data) or \
+ if bb.data.inherits_class('kernel', e.data) or \
bb.data.inherits_class('module-base', e.data) or \
(bb.data.inherits_class('allarch', e.data) and\
not bb.data.inherits_class('packagegroup', e.data)):
@@ -177,5 +175,5 @@ python multilib_virtclass_handler_global () {
}
addhandler multilib_virtclass_handler_global
-multilib_virtclass_handler_global[eventmask] = "bb.event.RecipePreFinalise bb.event.RecipeParsed"
+multilib_virtclass_handler_global[eventmask] = "bb.event.RecipeParsed"