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

Darren Hart dvhart at linux.intel.com
Tue May 24 22:35:42 UTC 2011


On 05/24/2011 03:31 PM, Darren Hart wrote:
> From: Darren Hart <dvhart at linux.intel.com>
> 
> The script forces TEMPLATECONF to be non-empty with:
> 
>     TEMPLATECONF=${TEMPLATECONF:-meta-yocto/conf}
> 
> This ensures that OELOCALCONF and OELAYERSCONF will be non-empty as well. Remove
> all the empty checks for these variables.
> 
> While this patch doesn't change behavior, all this code was unreachable, it does
> bring up a point of intent. It appears as though OE*CONF was intended to be
> configurable by the user via the environment, the code only allows for the user
> to set TEMPLATECONF. This means that in order to use something other than the
> sample default configs, the user must specify both a local.conf.sample and a
> bblayers.conf.sample in their TEMPLATECONF directory.
> 
> Update the comments to correctly identify the required files as local.conf.sample
> and bblayers.conf.sample.
> 
> Signed-off-by: Darren Hart <dvhart at linux.intel.com>
> ---
>  scripts/create-pull-request |    2 +-
>  scripts/oe-setup-builddir   |   32 +++++++++++++-------------------
>  2 files changed, 14 insertions(+), 20 deletions(-)
> 
> diff --git a/scripts/create-pull-request b/scripts/create-pull-request
> index b808146..169b888 100755
> --- a/scripts/create-pull-request
> +++ b/scripts/create-pull-request
> @@ -24,7 +24,7 @@
>  # submission to Open Embedded and The Yocto Project, as well as to
>  # related projects and layers.
>  #
> -
> +set -x


EEEK, sorry about that. I've removed this and re-pushed to the same
contrib/dvhart/build branch. The only file changed is
scripts/oe-setup-builddir.

Apologies.

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




More information about the Openembedded-core mailing list