summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/conf/bblayers.conf.sample (renamed from build/conf/bblayers.conf.sample)0
-rw-r--r--meta/conf/local.conf.sample (renamed from build/conf/local.conf.sample)0
-rw-r--r--meta/conf/site.conf.sample (renamed from build/conf/site.conf.sample)0
-rwxr-xr-xscripts/poky-env-internal4
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
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"