summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2010-08-17 17:34:59 +0100
committerJoshua Lock <josh@linux.intel.com>2010-08-17 17:41:20 +0100
commite624b2700abc93990b58bef0ba9447373148a31c (patch)
tree1e8c6773d5eebb7177da07499fa33647e2b4945d /scripts
parent2225e1214285f0e9a3c0ee2962b3d678c5c05292 (diff)
downloadpoky-e624b2700abc93990b58bef0ba9447373148a31c.tar.gz
build/conf: move sample conf files to meta/conf
Currently rm -fr build breaks things badly but will work if we move the sample configuration files to meta/conf - this patch does so. Signed-off-by: Joshua Lock <josh@linux.intel.com>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/poky-env-internal4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/poky-env-internal b/scripts/poky-env-internal
index 3279fb0bea..e8d8f2b037 100755
--- a/scripts/poky-env-internal
+++ b/scripts/poky-env-internal
@@ -59,7 +59,7 @@ if ! (test -d "$BITBAKEDIR" && test -d "$BUILDDIR"); then
59fi 59fi
60 60
61if [ "x" = "x$POKYLOCALCONF" ]; then 61if [ "x" = "x$POKYLOCALCONF" ]; then
62 POKYLOCALCONF="$OEROOT/build/conf/local.conf.sample" 62 POKYLOCALCONF="$OEROOT/meta/conf/local.conf.sample"
63fi 63fi
64if ! (test -r "$BUILDDIR/conf/local.conf"); then 64if ! (test -r "$BUILDDIR/conf/local.conf"); then
65 echo "You had no conf/local.conf file. Poky has created this configuration file for you" 65 echo "You had no conf/local.conf file. Poky has created this configuration file for you"
@@ -73,7 +73,7 @@ if ! (test -r "$BUILDDIR/conf/local.conf"); then
73fi 73fi
74 74
75if [ "x" = "x$POKYLAYERCONF" ]; then 75if [ "x" = "x$POKYLAYERCONF" ]; then
76 POKYLAYERCONF="$OEROOT/build/conf/bblayers.conf.sample" 76 POKYLAYERCONF="$OEROOT/meta/conf/bblayers.conf.sample"
77fi 77fi
78if ! (test -r "$BUILDDIR/conf/bblayers.conf"); then 78if ! (test -r "$BUILDDIR/conf/bblayers.conf"); then
79 echo "You had no conf/bblayers.conf file. Poky has created this configuration file for you" 79 echo "You had no conf/bblayers.conf file. Poky has created this configuration file for you"