From 37ac9a0823690bd3e031c04e2351a41af04e8aa1 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Thu, 21 Apr 2011 19:19:33 +0100
Subject: scripts/oe-setup-builddir: Fix up OE-Core/Poky mismatch for now (and
 fix permissions)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 scripts/oe-setup-builddir | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
 mode change 100644 => 100755 scripts/oe-setup-builddir

(limited to 'scripts/oe-setup-builddir')

diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir
old mode 100644
new mode 100755
index 2f8a0646b9..58c9ad67e1
--- a/scripts/oe-setup-builddir
+++ b/scripts/oe-setup-builddir
@@ -37,6 +37,8 @@ fi
 
 cd "$BUILDDIR"
 
+TEMPLATECONF=meta-yocto/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
-- 
cgit v1.2.3-54-g00ecf