diff options
-rw-r--r-- | meta-yocto/conf/bblayers.conf.sample (renamed from meta/conf/bblayers.conf.sample) | 0 | ||||
-rw-r--r-- | meta-yocto/conf/distro/poky-bleeding.conf (renamed from meta/conf/distro/poky-bleeding.conf) | 0 | ||||
-rw-r--r-- | meta-yocto/conf/distro/poky-lsb.conf (renamed from meta/conf/distro/poky-lsb.conf) | 0 | ||||
-rw-r--r-- | meta-yocto/conf/distro/poky.conf (renamed from meta/conf/distro/poky.conf) | 0 | ||||
-rw-r--r-- | meta-yocto/conf/local.conf.sample (renamed from meta/conf/local.conf.sample) | 0 | ||||
-rw-r--r-- | meta-yocto/conf/machine/atom-pc.conf (renamed from meta/conf/machine/atom-pc.conf) | 0 | ||||
-rw-r--r-- | meta-yocto/conf/machine/beagleboard.conf (renamed from meta/conf/machine/beagleboard.conf) | 0 | ||||
-rw-r--r-- | meta-yocto/conf/machine/mpc8315e-rdb.conf (renamed from meta/conf/machine/mpc8315e-rdb.conf) | 0 | ||||
-rw-r--r-- | meta-yocto/conf/machine/routerstationpro.conf (renamed from meta/conf/machine/routerstationpro.conf) | 0 | ||||
-rw-r--r-- | meta-yocto/conf/site.conf.sample (renamed from meta/conf/site.conf.sample) | 0 | ||||
-rwxr-xr-x | scripts/poky-setup-builddir | 4 |
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 | |||
56 | fi | 56 | fi |
57 | 57 | ||
58 | if [ "x" = "x$POKYLOCALCONF" ]; then | 58 | if [ "x" = "x$POKYLOCALCONF" ]; then |
59 | POKYLOCALCONF="$OEROOT/meta/conf/local.conf.sample" | 59 | POKYLOCALCONF="$OEROOT/meta-yocto/conf/local.conf.sample" |
60 | fi | 60 | fi |
61 | if ! (test -r "$BUILDDIR/conf/local.conf"); then | 61 | if ! (test -r "$BUILDDIR/conf/local.conf"); then |
62 | cat <<EOM | 62 | cat <<EOM |
@@ -74,7 +74,7 @@ EOM | |||
74 | fi | 74 | fi |
75 | 75 | ||
76 | if [ "x" = "x$POKYLAYERCONF" ]; then | 76 | if [ "x" = "x$POKYLAYERCONF" ]; then |
77 | POKYLAYERCONF="$OEROOT/meta/conf/bblayers.conf.sample" | 77 | POKYLAYERCONF="$OEROOT/meta-yocto/conf/bblayers.conf.sample" |
78 | fi | 78 | fi |
79 | if ! (test -r "$BUILDDIR/conf/bblayers.conf"); then | 79 | if ! (test -r "$BUILDDIR/conf/bblayers.conf"); then |
80 | cat <<EOM | 80 | cat <<EOM |