meta-yocto: Move files inappropriate to OE-Core from meta

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

11 files changed, 2 insertions, 2 deletions

diff --git a/meta/conf/bblayers.conf.sample b/meta-yocto/conf/bblayers.conf.sample
index b2f37c0c81..b2f37c0c81 100644
--- a/meta/conf/bblayers.conf.sample
+++ b/meta-yocto/conf/bblayers.conf.sample
diff --git a/meta/conf/distro/poky-bleeding.conf b/meta-yocto/conf/distro/poky-bleeding.conf
index 328acfeb75..328acfeb75 100644
--- a/meta/conf/distro/poky-bleeding.conf
+++ b/meta-yocto/conf/distro/poky-bleeding.conf
diff --git a/meta/conf/distro/poky-lsb.conf b/meta-yocto/conf/distro/poky-lsb.conf
index 749c85886a..749c85886a 100644
--- a/meta/conf/distro/poky-lsb.conf
+++ b/meta-yocto/conf/distro/poky-lsb.conf
diff --git a/meta/conf/distro/poky.conf b/meta-yocto/conf/distro/poky.conf
index 71e40de6f2..71e40de6f2 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta-yocto/conf/distro/poky.conf
diff --git a/meta/conf/local.conf.sample b/meta-yocto/conf/local.conf.sample
index 434c6841bf..434c6841bf 100644
--- a/meta/conf/local.conf.sample
+++ b/meta-yocto/conf/local.conf.sample
diff --git a/meta/conf/machine/atom-pc.conf b/meta-yocto/conf/machine/atom-pc.conf
index b94deb20e5..b94deb20e5 100644
--- a/meta/conf/machine/atom-pc.conf
+++ b/meta-yocto/conf/machine/atom-pc.conf
diff --git a/meta/conf/machine/beagleboard.conf b/meta-yocto/conf/machine/beagleboard.conf
index b1f73504bf..b1f73504bf 100644
--- a/meta/conf/machine/beagleboard.conf
+++ b/meta-yocto/conf/machine/beagleboard.conf
diff --git a/meta/conf/machine/mpc8315e-rdb.conf b/meta-yocto/conf/machine/mpc8315e-rdb.conf
index 34b75bbc8a..34b75bbc8a 100644
--- a/meta/conf/machine/mpc8315e-rdb.conf
+++ b/meta-yocto/conf/machine/mpc8315e-rdb.conf
diff --git a/meta/conf/machine/routerstationpro.conf b/meta-yocto/conf/machine/routerstationpro.conf
index d464842134..d464842134 100644
--- a/meta/conf/machine/routerstationpro.conf
+++ b/meta-yocto/conf/machine/routerstationpro.conf
diff --git a/meta/conf/site.conf.sample b/meta-yocto/conf/site.conf.sample
index 42042042f7..42042042f7 100644
--- a/meta/conf/site.conf.sample
+++ b/meta-yocto/conf/site.conf.sample
diff --git a/scripts/poky-setup-builddir b/scripts/poky-setup-builddir
index 7a49a8fb9c..64240e1e5d 100755
--- a/scripts/poky-setup-builddir
+++ b/scripts/poky-setup-builddir
@@ -56,7 +56,7 @@ if [ "x" != "x$POKYCONF" ]; then
 fi
 
 if [ "x" = "x$POKYLOCALCONF" ]; then
-    POKYLOCALCONF="$OEROOT/meta/conf/local.conf.sample"
+    POKYLOCALCONF="$OEROOT/meta-yocto/conf/local.conf.sample"
 fi
 if ! (test -r "$BUILDDIR/conf/local.conf"); then
 cat <<EOM
@@ -74,7 +74,7 @@ EOM
 fi
 
 if [ "x" = "x$POKYLAYERCONF" ]; then
-    POKYLAYERCONF="$OEROOT/meta/conf/bblayers.conf.sample"
+    POKYLAYERCONF="$OEROOT/meta-yocto/conf/bblayers.conf.sample"
 fi
 if ! (test -r "$BUILDDIR/conf/bblayers.conf"); then
 cat <<EOM