aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-16 15:59:27 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-05-16 15:59:27 +0100
commitbfb95dc78076ef6f26b8f1378fcb6b5d1b3d8cb9 (patch)
tree6adfdfc8e6ece5c7e67b792361df1d895f2306b6 /scripts
parentf422f928adc25b17966fe5bfb84bfe9dadb64555 (diff)
downloadopenembedded-core-bfb95dc78076ef6f26b8f1378fcb6b5d1b3d8cb9.tar.gz
openembedded-core-bfb95dc78076ef6f26b8f1378fcb6b5d1b3d8cb9.tar.bz2
openembedded-core-bfb95dc78076ef6f26b8f1378fcb6b5d1b3d8cb9.zip
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>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/oe-setup-builddir6
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/oe-setup-builddir b/scripts/oe-setup-builddir
index 7fefc52509..87e77103b4 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