[oe-commits] Richard Purdie : scripts/oe-setup-builddir: Add missing . sample extensions and default to meta/conf for sample files

[git version control]

Module: openembedded-core.git
Branch: master
Commit: bfb95dc78076ef6f26b8f1378fcb6b5d1b3d8cb9
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=bfb95dc78076ef6f26b8f1378fcb6b5d1b3d8cb9

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Mon May 16 15:59:27 2011 +0100

scripts/oe-setup-builddir: Add missing .sample extensions and default to meta/conf for sample files

Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 scripts/oe-setup-builddir |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir
index 7fefc52..87e7710 100755
--- a/scripts/oe-setup-builddir
+++ b/scripts/oe-setup-builddir
@@ -37,6 +37,8 @@ fi
 
 cd "$BUILDDIR"
 
+TEMPLATECONF=${TEMPLATECONF:-meta/conf}
+
 # 
 # $TEMPLATECONF can point to a directory for the template local.conf & bblayers.conf
 #
@@ -51,8 +53,8 @@ if [ "x" != "x$TEMPLATECONF" ]; then
 	    return
 	fi
     fi
-    OECORELAYERCONF="$TEMPLATECONF/bblayers.conf"
-    OECORELOCALCONF="$TEMPLATECONF/local.conf"
+    OECORELAYERCONF="$TEMPLATECONF/bblayers.conf.sample"
+    OECORELOCALCONF="$TEMPLATECONF/local.conf.sample"
 fi
 
 if [ "x" = "x$OECORELOCALCONF" ]; then