]> code.ossystems Code Review - openembedded-core.git/commitdiff
scripts/oe-setup-builddir: Add missing .sample extensions and default to meta/conf...
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 16 May 2011 14:59:27 +0000 (15:59 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Mon, 16 May 2011 14:59:27 +0000 (15:59 +0100)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
scripts/oe-setup-builddir

index 7fefc52509e24e4dd5dc9027f8264e499271e21b..87e77103b4b3fa2f9bce3a547082d50763c887cb 100755 (executable)
@@ -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