[OE-core] [PATCH 2/3] multilib: Enable multilib remapping for SDK generation

[Richard Purdie]

On Mon, 2012-07-09 at 08:08 -0500, Mark Hatle wrote:
> On 7/9/12 5:39 AM, Richard Purdie wrote:
> > On Fri, 2012-07-06 at 14:14 -0500, Mark Hatle wrote:
> >> Enable the remapping for SDK generation, this is required to be able to
> >> create an SDK that targets an alternative multilib.  Note, this work does
> >> not finish SDK/multilib support, but it is one more step toward making
> >> it work properly.
> >>
> >> Signed-off-by: Mark Hatle <mark.hatle at windriver.com>
> >> ---
> >>   meta/classes/multilib.bbclass |    6 ++++++
> >>   1 files changed, 6 insertions(+), 0 deletions(-)
> >>
> >> diff --git a/meta/classes/multilib.bbclass b/meta/classes/multilib.bbclass
> >> index f3e7618..b92a3ff 100644
> >> --- a/meta/classes/multilib.bbclass
> >> +++ b/meta/classes/multilib.bbclass
> >> @@ -54,6 +54,12 @@ python __anonymous () {
> >>           d.setVar("LINGUAS_INSTALL", "")
> >>           # FIXME, we need to map this to something, not delete it!
> >>           d.setVar("PACKAGE_INSTALL_ATTEMPTONLY", "")
> >> +
> >> +    if bb.data.inherits_class('populate_sdk_base', d):
> >> +        clsextend.map_depends_variable("TOOLCHAIN_TARGET_TASK")
> >> +        clsextend.map_depends_variable("TOOLCHAIN_TARGET_TASK_ATTEMPTONLY")
> >> +
> >> +    if bb.data.inherits_class('image', d) or bb.data.inherits_class('populate_sdk_base', d):
> >>           return
> >>
> >
> > There is something odd going on with this patch. You've removed the
> > earlier return but this patch doesn't show that...
> 
> I didn't remove it, I 'moved' it later.  Otherwise the populate_sdk_base case is 
> never run, when the image case has already been loaded.
> 
> So the flow goes from:

I understand this. Let me put this in a simpler way. Could you send a
patch that cleanly applies against master please? There is something
wrong with it and it doesn't apply.

Cheers,

Richard