From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga14.intel.com ([143.182.124.37]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1QPNiq-0007NJ-22 for openembedded-core@lists.openembedded.org; Thu, 26 May 2011 01:42:40 +0200 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga102.ch.intel.com with ESMTP; 25 May 2011 16:39:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.65,270,1304319600"; d="scan'208";a="1822618" Received: from unknown (HELO [10.255.12.181]) ([10.255.12.181]) by azsmga001.ch.intel.com with ESMTP; 25 May 2011 16:39:35 -0700 Message-ID: <4DDD933F.2090704@linux.intel.com> Date: Wed, 25 May 2011 16:39:43 -0700 From: Darren Hart User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.17) Gecko/20110424 Lightning/1.0b2 Thunderbird/3.1.10 MIME-Version: 1.0 To: Patches and discussions about the oe-core layer References: <4DDCA269.1030006@linux.intel.com> <4DDD433F.4090009@linux.intel.com> <4DDD7983.1030205@linux.intel.com> <1306363115.27470.74.camel@rex> In-Reply-To: <1306363115.27470.74.camel@rex> Subject: Re: [PATCH 0/1] oe-setup-builddir: remove unreachable code, update comments X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 May 2011 23:42:40 -0000 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit 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 >>>>> >>>>> 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