[linux-yocto] [PATCH 2/3] meta: fri2 - fix mixed emgd versions problem

[Bruce Ashfield]

On 12-08-09 01:51 PM, Tom Zanussi wrote:
> On Thu, 2012-08-09 at 13:38 -0400, Bruce Ashfield wrote:
>> On 12-08-09 01:35 PM, Tom Zanussi wrote:
>>> On Thu, 2012-08-09 at 13:30 -0400, Bruce Ashfield wrote:
>>>> On 12-08-09 11:11 AM, tom.zanussi at intel.com wrote:
>>>>> From: Tom Zanussi<tom.zanussi at intel.com>
>>>>>
>>>>> The fri2 BSP includes the emgd-1.10 feature but merges the emgd-1.8
>>>>> branch.  This change merges the 1.10 emgd branch as intended, and
>>>>> removes the feature include, which is no longer needed since it's done
>>>>> automatically now via a staging feature.
>>>>>
>>>>> Signed-off-by: Tom Zanussi<tom.zanussi at intel.com>
>>>>> ---
>>>>>     meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc |    3 +--
>>>>>     1 files changed, 1 insertions(+), 2 deletions(-)
>>>>>
>>>>> diff --git a/meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc b/meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc
>>>>> index 28f142e..a42f1b5 100644
>>>>> --- a/meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc
>>>>> +++ b/meta/cfg/kernel-cache/bsp/fri2/fri2-standard.scc
>>>>> @@ -5,8 +5,7 @@ define KARCH i386
>>>>>     include ktypes/standard
>>>>>     branch fri2
>>>>>
>>>>> -include features/emgd/emgd-1.10.scc
>>>>> -git merge emgd
>>>>> +git merge emgd-1.10
>>>>
>>>> Stupid question. Is this for the 3.2 yocto tree ? while the
>>>> 1.14 ones are for the 3.4 ?  or do we have a mix here ?
>>>>
>>>
>>> No, this is all 3.4 - haven't even looked at 3.2
>>
>> ok. So at this point, those BSPs are merging empty branches. We don't
>> have a emgd-1.10 port to 3.4 at the moment.
>>
>
> We won't have an emgd-1.10 port to 3.4, just 1.14 for 3.4.  I guess 3.2
> would have the fri2 problem, but crownbay wouldn't because emgd 1.14
> only exists in 3.4.
>
>> I've got the following commit prepared based on completing my work
>> to staging:
>>
>> http://git.yoctoproject.org/cgit/cgit.cgi/yocto-kernel-cache/commit/?id=c2f893935f21ff9afe0e631438821e0dda1c7647
>>
>> I'll add your Sign-off, and move it into the meta branch if it looks
>> ok.
>>
>> That commit completes the work to be able to generate a tree with as
>> many emgd branches as you want, and have BSPs simply merge the topic
>> branch that they want.
>>
>> Comments ?
>>
>
> It looks ok to me, but I was just posting this to point out the problems
> - as mentioned, I haven't tested anything - I don't have the hardware,
> etc.

Works for me .. and neither do I :) the changes are all safe, and
technically correct (since the branches are empty). I'll go forward
with that change, and we can update the BSPs after that.

Cheers,

Bruce

>
>
> Tom
>
>> Bruce
>>
>>>
>>>
>>> Tom
>>>
>>>> Bruce
>>>>
>>>>>
>>>>>     include fri2.scc
>>>>>     include cfg/efi-ext.scc
>>>>
>>>
>>>
>>
>
>