From e624b2700abc93990b58bef0ba9447373148a31c Mon Sep 17 00:00:00 2001
From: Joshua Lock <josh@linux.intel.com>
Date: Tue, 17 Aug 2010 17:34:59 +0100
Subject: [PATCH] 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>
---
 {build => meta}/conf/bblayers.conf.sample | 0
 {build => meta}/conf/local.conf.sample    | 0
 {build => meta}/conf/site.conf.sample     | 0
 scripts/poky-env-internal                 | 4 ++--
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename {build => meta}/conf/bblayers.conf.sample (100%)
 rename {build => meta}/conf/local.conf.sample (100%)
 rename {build => meta}/conf/site.conf.sample (100%)

diff --git a/build/conf/bblayers.conf.sample b/meta/conf/bblayers.conf.sample
similarity index 100%
rename from build/conf/bblayers.conf.sample
rename to meta/conf/bblayers.conf.sample
diff --git a/build/conf/local.conf.sample b/meta/conf/local.conf.sample
similarity index 100%
rename from build/conf/local.conf.sample
rename to meta/conf/local.conf.sample
diff --git a/build/conf/site.conf.sample b/meta/conf/site.conf.sample
similarity index 100%
rename from build/conf/site.conf.sample
rename to meta/conf/site.conf.sample
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
 fi
 
 if [ "x" = "x$POKYLOCALCONF" ]; then
-    POKYLOCALCONF="$OEROOT/build/conf/local.conf.sample"
+    POKYLOCALCONF="$OEROOT/meta/conf/local.conf.sample"
 fi
 if ! (test -r "$BUILDDIR/conf/local.conf"); then
     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
 fi
 
 if [ "x" = "x$POKYLAYERCONF" ]; then
-    POKYLAYERCONF="$OEROOT/build/conf/bblayers.conf.sample"
+    POKYLAYERCONF="$OEROOT/meta/conf/bblayers.conf.sample"
 fi
 if ! (test -r "$BUILDDIR/conf/bblayers.conf"); then
     echo "You had no conf/bblayers.conf file. Poky has created this configuration file for you"