From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Mon, 16 May 2011 14:59:27 +0000 (+0100)
Subject: scripts/oe-setup-builddir: Add missing .sample extensions and default to meta/conf... 
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~45591
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bfb95dc78076ef6f26b8f1378fcb6b5d1b3d8cb9;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

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

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

diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir
index 7fefc52509e..87e77103b4b 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