From d80c95d53f9116e60497385389e84ea0ee1bb44e Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 17 Jan 2017 12:11:15 +0000 Subject: 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 --- meta/classes/multilib_global.bbclass | 10 ++++------ 1 file 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" -- cgit v1.2.3-54-g00ecf