From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga11.intel.com ([192.55.52.93]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1QP0B6-0005pO-G0 for openembedded-core@lists.openembedded.org; Wed, 25 May 2011 00:34:16 +0200 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP; 24 May 2011 15:31:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.65,263,1304319600"; d="scan'208";a="8042559" Received: from unknown (HELO localhost) ([10.255.12.149]) by fmsmga001.fm.intel.com with ESMTP; 24 May 2011 15:31:13 -0700 Message-Id: In-Reply-To: References: Old-Date: Tue, 24 May 2011 15:00:26 -0700 Date: Tue, 24 May 2011 15:31:17 -0700 To: openembedded-core@lists.openembedded.org CC: From: Darren Hart Subject: [PATCH 1/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: Tue, 24 May 2011 22:34:16 -0000 From: Darren Hart 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 --- 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 ODIR=pull-$$ RELATIVE_TO="master" COMMIT_ID="HEAD" diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir index 5fc8b19..6c2e837 100755 --- a/scripts/oe-setup-builddir +++ b/scripts/oe-setup-builddir @@ -37,29 +37,26 @@ fi cd "$BUILDDIR" -TEMPLATECONF=${TEMPLATECONF:-meta-yocto/conf} # -# $TEMPLATECONF can point to a directory for the template local.conf & bblayers.conf +# $TEMPLATECONF can point to a directory for the template local.conf & +# bblayers.conf. If the user hasn't specified a path, default to +# meta-yocto/conf. # -if [ "x" != "x$TEMPLATECONF" ]; then +TEMPLATECONF=${TEMPLATECONF:-meta-yocto/conf} +if ! (test -d "$TEMPLATECONF"); then + # Allow TEMPLATECONF=meta-xyz/conf as a shortcut + if [ -d "$OEROOT/$TEMPLATECONF" ]; then + TEMPLATECONF="$OEROOT/$TEMPLATECONF" + fi if ! (test -d "$TEMPLATECONF"); then - # Allow TEMPLATECONF=meta-xyz/conf as a shortcut - if [ -d "$OEROOT/$TEMPLATECONF" ]; then - TEMPLATECONF="$OEROOT/$TEMPLATECONF" - fi - if ! (test -d "$TEMPLATECONF"); then - echo >&2 "Error: '$TEMPLATECONF' must be a directory containing local.conf & bblayers.conf" - return - fi + echo >&2 "Error: '$TEMPLATECONF' must be a directory containing local.conf.sample & bblayers.conf.sample" + return fi - OECORELAYERCONF="$TEMPLATECONF/bblayers.conf.sample" - OECORELOCALCONF="$TEMPLATECONF/local.conf.sample" fi +OECORELAYERCONF="$TEMPLATECONF/bblayers.conf.sample" +OECORELOCALCONF="$TEMPLATECONF/local.conf.sample" -if [ "x" = "x$OECORELOCALCONF" ]; then - OECORELOCALCONF="$OEROOT/meta/conf/local.conf.sample" -fi if ! (test -r "$BUILDDIR/conf/local.conf"); then cat <