Re: [PATCH 0/1] oe-setup-builddir: remove unreachable code, update comments

[Darren Hart <dvhart@linux.intel.com>]

On 05/25/2011 03:38 PM, Richard Purdie wrote:
> On Wed, 2011-05-25 at 14:49 -0700, Saul Wold wrote:
>> On 05/25/2011 10:58 AM, Darren Hart wrote:
>>>
>>>
>>> On 05/24/2011 11:32 PM, Saul Wold wrote:
>>>> On 05/24/2011 03:31 PM, Darren Hart wrote:
>>>>> From: Darren Hart<dvhart@linux.intel.com>
>>>>>
>>>>> The following changes since commit 32a4e746273c3c7d3dd0f13b745bc0679cadaa44:
>>>>>
>>>>>     codeparser.py: fix syntax error in exception handling (2011-05-24 17:16:47 +0100)
>>>>>
>>>>> are available in the git repository at:
>>>>>     git://git.pokylinux.org/poky-contrib.git dvhart/build
>>>>>     http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dvhart/build
>>>>>
>>>>> Darren Hart (1):
>>>>>     oe-setup-builddir: remove unreachable code, update comments
>>>>>
>>>>>    scripts/create-pull-request |    2 +-
>>>>>    scripts/oe-setup-builddir   |   32 +++++++++++++-------------------
>>>>>    2 files changed, 14 insertions(+), 20 deletions(-)
>>>>>
>>>>>
>>>> If this is intended for oe-core, please rebase to oe-core and resend, I
>>>> had a merge issue and want to make sure I am getting the right code
>>>> committed.
>>>
>>>
>>> Gah, right. I saw the oe- in the script name and just had oe-core in my
>>> head. Apologies. The two scripts are slightly different in the two
>>> repositories, but both suffer from the same unreachable code problem.
>>>
>>> Would you prefer I send two patches, one for each repository, or that I
>>> push to one or the other and let you handle the merge process as part of
>>> the regular sync up process (whatever that is).
>>>
>> Typically, if something is part of oe-core than a patch request goes 
>> there and then Richard will pull it across to poky.  This is a special 
>> case and I am not sure how he is handling this currently. So we need 
>> Richard to chime in on this one.
> 
> They should be the same script, that is what I've been aiming for. If
> they're not, we need to work out how to get them there...

The diff is quite minimal:

-TEMPLATECONF=${TEMPLATECONF:-meta-yocto/conf}
+TEMPLATECONF=${TEMPLATECONF:-meta/conf}

We could have a templateconf symlink or we could modify a common conf
directory for systems that incorporate oe-core. Failing that we would
need a yocto specific wrapper to the setup scripts to specify our
preferred directory. I will send the patch as is based on oe and ask
that it be merged to poky as well.

> 
> Cheers,
> 
> Richard
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

-- 
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel