4 files changed, 2 insertions, 2 deletions
diff --git a/build/conf/bblayers.conf.sample b/meta/conf/bblayers.conf.sample
index d361f244d9..d361f244d9 100644
--- a/build/conf/bblayers.conf.sample
+++ b/meta/conf/bblayers.conf.sample
diff --git a/build/conf/local.conf.sample b/meta/conf/local.conf.sample
index 66acaa49a7..66acaa49a7 100644
--- a/build/conf/local.conf.sample
+++ b/meta/conf/local.conf.sample
diff --git a/build/conf/site.conf.sample b/meta/conf/site.conf.sample
index 42042042f7..42042042f7 100644
--- a/build/conf/site.conf.sample
+++ b/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"

diff --git a/build/conf/bblayers.conf.sample b/meta/conf/bblayers.conf.sample index d361f244d9..d361f244d9 100644 --- a/build/conf/bblayers.conf.sample +++ b/meta/conf/bblayers.conf.sample


diff --git a/build/conf/local.conf.sample b/meta/conf/local.conf.sample index 66acaa49a7..66acaa49a7 100644 --- a/build/conf/local.conf.sample +++ b/meta/conf/local.conf.sample


diff --git a/build/conf/site.conf.sample b/meta/conf/site.conf.sample index 42042042f7..42042042f7 100644 --- a/build/conf/site.conf.sample +++ b/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
59	fi	59	fi
60		60
61	if [ "x" = "x$POKYLOCALCONF" ]; then	61	if [ "x" = "x$POKYLOCALCONF" ]; then
62	POKYLOCALCONF="$OEROOT/build/conf/local.conf.sample"	62	POKYLOCALCONF="$OEROOT/meta/conf/local.conf.sample"
63	fi	63	fi
64	if ! (test -r "$BUILDDIR/conf/local.conf"); then	64	if ! (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
73	fi	73	fi
74		74
75	if [ "x" = "x$POKYLAYERCONF" ]; then	75	if [ "x" = "x$POKYLAYERCONF" ]; then
76	POKYLAYERCONF="$OEROOT/build/conf/bblayers.conf.sample"	76	POKYLAYERCONF="$OEROOT/meta/conf/bblayers.conf.sample"
77	fi	77	fi
78	if ! (test -r "$BUILDDIR/conf/bblayers.conf"); then	78	if ! (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"